ProPeace/de.forumzfd.twinglecampaign
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug-fixes

Browse source
This commit is contained in:
Marc Michalsky forumZFD 2021-02-22 19:31:44 +01:00
parent 537ed5cb02
commit fe927c4d39
Signed by untrusted user who does not match committer: marc.koch
GPG key ID: 12406554CFB028B9
3 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
CRM/TwingleCampaign/BAO/CustomField.php
View file

@ -1,7 +1,6 @@
<?php
use CRM_TwingleCampaign_ExtensionUtil as E;
use CRM_TwingleCampaign_Utils_ExtensionCache as ExtensionCache;
class CRM_TwingleCampaign_BAO_CustomField {
@ -152,11 +151,20 @@ class CRM_TwingleCampaign_BAO_CustomField {
// If no specific custom field is requested
if (!$name) {
$result = [];
$customFields =
ExtensionCache::getInstance()->getCampaigns()['custom_fields'];
// Get json file with all custom fields for this extension
$json_file = file_get_contents(E::path() .
'/CRM/TwingleCampaign/resources/campaigns.json');
$campaign_info = json_decode($json_file, TRUE);
// Log an error and throw an exception if the file cannot get read
if (!$campaign_info) {
Civi::log()->error("Could not read json file");
throw new Exception('Could not read json file');
}
// Recursive method call with all custom field names from the json file
foreach ($customFields as $customField) {
foreach ($campaign_info['custom_fields'] as $customField) {
$result[] = self::fetch($customField['name']);
}
return $result;
@ -171,7 +179,12 @@ class CRM_TwingleCampaign_BAO_CustomField {
'name' => $name,
]
);
return new self(array_shift($custom_field['values']));
if ($custom_field = array_shift($custom_field['values'])) {
return new self($custom_field);
}
else {
return NULL;
}
} catch (CiviCRM_API3_Exception $e) {
return NULL;
}

2
CRM/TwingleCampaign/BAO/CustomGroup.php
View file

@ -1,5 +1,7 @@
<?php
use CRM_TwingleCampaign_ExtensionUtil as E;
class CRM_TwingleCampaign_BAO_CustomGroup {
private $id;

22
CRM/TwingleCampaign/BAO/OptionValue.php
View file

@ -1,7 +1,6 @@
<?php
use CRM_TwingleCampaign_ExtensionUtil as E;
use CRM_TwingleCampaign_Utils_ExtensionCache as ExtensionCache;
class CRM_TwingleCampaign_BAO_OptionValue {
@ -132,10 +131,20 @@ class CRM_TwingleCampaign_BAO_OptionValue {
// If no specific option value is requested
if (!$name) {
$result = [];
$optionValues = ExtensionCache::getInstance()->getOptionValues();
// Get json file with all custom fields for this extension
$json_file = file_get_contents(E::path() .
'/CRM/TwingleCampaign/resources/option_values.json');
$option_values = json_decode($json_file, TRUE);
// Log an error and throw an exception if the file cannot get read
if (!$option_values) {
Civi::log()->error("Could not read json file");
throw new Exception('Could not read json file');
}
// Recursive method call with all custom field names from the json file
foreach ($optionValues as $optionValue) {
foreach ($option_values as $optionValue) {
$result[] = self::fetch($optionValue['name']);
}
return $result;
@ -150,7 +159,12 @@ class CRM_TwingleCampaign_BAO_OptionValue {
'name' => $name,
]
);
return new self(array_shift($option_value['values']));
if ($option_value = array_shift($option_value['values'])) {
return new self($option_value);
}
else {
return NULL;
}
} catch (CiviCRM_API3_Exception $e) {
return NULL;
}