Merge remote-tracking branch 'gitea/dev' into main

This commit is contained in:
Marc Michalsky forumZFD 2021-03-23 10:34:15 +01:00
commit 007599eb19
Signed by untrusted user who does not match committer: marc.koch
GPG key ID: 12406554CFB028B9
7 changed files with 25 additions and 7 deletions

View file

@ -241,6 +241,7 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
$parentCampaign = civicrm_api3('Campaign', 'get', [ $parentCampaign = civicrm_api3('Campaign', 'get', [
'sequential' => 1, 'sequential' => 1,
$cf_project_id => $this->values['project_id'], $cf_project_id => $this->values['project_id'],
'options' => ['limit' => 0]
]); ]);
if ($parentCampaign['is_error'] == 0) { if ($parentCampaign['is_error'] == 0) {
return (int) $parentCampaign['id']; return (int) $parentCampaign['id'];

View file

@ -102,6 +102,7 @@ class CRM_TwingleCampaign_Form_Settings extends CRM_Core_Form {
try { try {
$result = civicrm_api3('CaseType', 'get', [ $result = civicrm_api3('CaseType', 'get', [
'sequential' => 1, 'sequential' => 1,
'options' => ['limit' => 0]
]); ]);
if (is_array($result['values'])) { if (is_array($result['values'])) {
foreach ($result['values'] as $case) { foreach ($result['values'] as $case) {

View file

@ -78,7 +78,11 @@ class CRM_TwingleCampaign_Utils_ExtensionCache {
$campaign_type_id = civicrm_api3( $campaign_type_id = civicrm_api3(
'OptionValue', 'OptionValue',
'get', 'get',
['sequential' => 1, 'name' => $campaign_type['name']] [
'sequential' => 1,
'name' => $campaign_type['name'],
'options' => ['limit' => 0],
]
)['values']; )['values'];
if ($campaign_type_id) { if ($campaign_type_id) {
$this->campaigns['campaign_types'][$campaign_type['name']]['id'] = $this->campaigns['campaign_types'][$campaign_type['name']]['id'] =

View file

@ -126,6 +126,9 @@ function civicrm_api3_twingle_campaign_Get(array $params): array {
// Include campaign type ot TwingleCampaigns in $params // Include campaign type ot TwingleCampaigns in $params
$params['campaign_type_id'] = $twingle_campaign_campaign_type_id; $params['campaign_type_id'] = $twingle_campaign_campaign_type_id;
// Do not limit the number of results
$params['options'] = ['limit' => 0];
// Get TwingleCampaign children campaigns of the TwingleProject // Get TwingleCampaign children campaigns of the TwingleProject
$campaigns = civicrm_api3('Campaign', $campaigns = civicrm_api3('Campaign',
'get', 'get',

View file

@ -108,7 +108,9 @@ function civicrm_api3_twingle_event_Get(array $params): array {
$custom_field_mapping_reverse = array_flip($custom_field_mapping); $custom_field_mapping_reverse = array_flip($custom_field_mapping);
$params['campaign_type_id'] = 'twingle_event'; $params['campaign_type_id'] = 'twingle_event';
$query = [];
// Do not limit the number of results
$query = ['options' => ['limit' => 0]];
foreach ($params as $key => $value) { foreach ($params as $key => $value) {
if ( $key != 'id' && if ( $key != 'id' &&

View file

@ -73,11 +73,17 @@ function civicrm_api3_twingle_form_Get(array $params): array {
unset($params['twingle_project_type']); unset($params['twingle_project_type']);
} }
$params['campaign_type_id'] = "twingle_project"; // Set query parameters
$params['is_active'] = 1; $query = [
'campaign_type_id' => "twingle_project",
'is_active' => 1,
'options' => ['limit' => 0]
];
$query = array_merge($params, $query);
try { try {
$result = civicrm_api3('Campaign', 'get', $params); $result = civicrm_api3('Campaign', 'get', $query);
if ($result['is_error'] == 0) { if ($result['is_error'] == 0) {
foreach($result['values'] as $value) { foreach($result['values'] as $value) {
@ -92,7 +98,7 @@ function civicrm_api3_twingle_form_Get(array $params): array {
'counter' => $value[$custom_field_mapping['twingle_project_counter']] 'counter' => $value[$custom_field_mapping['twingle_project_counter']]
]; ];
} }
return civicrm_api3_create_success($returnValues, $params, 'TwingleForm', 'Get'); return civicrm_api3_create_success($returnValues, $query, 'TwingleForm', 'Get');
} }
else { else {
return civicrm_api3_create_error($result['message']); return civicrm_api3_create_error($result['message']);

View file

@ -123,7 +123,8 @@ function civicrm_api3_twingle_project_Get(array $params): array {
$custom_field_mapping_reverse = array_flip($custom_field_mapping); $custom_field_mapping_reverse = array_flip($custom_field_mapping);
$params['campaign_type_id'] = 'twingle_project'; $params['campaign_type_id'] = 'twingle_project';
$query = []; // Do not limit the number of results
$query = ['options' => ['limit' => 0]];
foreach ($params as $key => $value) { foreach ($params as $key => $value) {
if ( $key != 'id' && if ( $key != 'id' &&