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

👾 bug fix: cannot set TwingleProject url via TwingleForm.create API

Browse source
This commit is contained in:
Marc Michalsky forumZFD 2021-04-15 20:07:48 +02:00
parent ef74a52e9f
commit c22911e886
Signed by untrusted user who does not match committer: marc.koch
GPG key ID: 12406554CFB028B9
4 changed files with 66 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

25
CRM/TwingleCampaign/BAO/Campaign.php
View file

@ -125,7 +125,9 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
/**
* ## Complement campaign values
* Complement existing campaign values with new ones
* Complement existing campaign values with new ones.
* Existing values will not get overwritten.
*
* @param array $arrayToComplement
*/
public function complement(array $arrayToComplement) {
@ -143,6 +145,27 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
}
}
/**
* ## Merge campaign values
* Merge existing campaign values with new ones.
* Existing values will be overwritten!
*
* @param array $arrayToMerge
*/
public function merge(array $arrayToMerge) {
$this->complement_r($arrayToMerge, $this->values);
}
private function merge_r($orig, &$fill) {
foreach ($orig as $key => $value) {
if (is_array($value)) {
$this->complement_r($orig[$key], $fill[$key]);
} else {
$fill[$key] = $value;
}
}
}
public static abstract function formatValues(array &$values, string $direction);
/**

28
CRM/TwingleCampaign/BAO/TwingleCampaign.php
View file

@ -32,15 +32,14 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
$this->id = $id ?? NULL;
$this->values['campaign_type_id'] = 'twingle_campaign';
if (!isset($this->id)) {
$this->update($values);
$this->getParentProject();
$this->update($values);
$this->getParentProject();
if (!isset($this->values['cid'])) {
$this->createCid();
$this->createUrl();
}
else {
$this->update($values);
}
$this->createUrl();
}
@ -102,8 +101,8 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
// until the parent campaign type is a TwingleProject
$parent_id = $this->values['parent_id'];
$parent_id = $parent_id ?? civicrm_api3(
'TwingleCampaign',
'getsingle',
'TwingleCampaign',
'getsingle',
['id' => $this->id]
)['parent_id'];
@ -318,7 +317,15 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
*/
public
function getResponse(string $status = NULL): array {
$keys = ['id', 'name', 'title', 'parent_project_id', 'parent_id', 'cid', 'url'];
$keys = [
'id',
'name',
'title',
'parent_project_id',
'parent_id',
'cid',
'url',
];
$response = [];
foreach ($keys as $key) {
if (isset($this->values[$key])) {
@ -366,6 +373,7 @@ class CRM_TwingleCampaign_BAO_TwingleCampaign {
/**
* ## Get ID
*
* @return mixed|null
*/
public function getId(): int {

3
api/v3/TwingleProject/Create.php
View file

@ -86,8 +86,7 @@ function civicrm_api3_twingle_project_Create(array $params): array {
unset($result['project_id']);
$project = new TwingleProject($result, $params['id']);
unset($params['id']);
$project->update($params);
$project->setEmbedData($params);
$project->merge($params);
}
// If no id is provided, try to create a new project with provided values
else {

36
twinglecampaign.php
View file

@ -62,26 +62,36 @@ function twinglecampaign_civicrm_postSave_civicrm_campaign($dao) {
if (empty($_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook']) ||
$_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook'] != TRUE) {
// If request is not an API-Call
if ($_GET['action'] != 'create') {
// If the db transaction is still running, add a function to it that will
// be called afterwards
if (CRM_Core_Transaction::isActive()) {
// If the db transaction is still running, add a function to it that will
// be called afterwards
if (CRM_Core_Transaction::isActive()) {
if (_validateAndSendInput($dao->id, $dao->campaign_type_id)) {
if (_validateAndSendInput($dao->id, $dao->campaign_type_id)) {
CRM_Core_Transaction::addCallback(
CRM_Core_Transaction::PHASE_POST_COMMIT,
'twinglecampaign_postSave_campaign_update_callback',
[$dao->id, $dao->campaign_type_id]
);
CRM_Core_Transaction::addCallback(
CRM_Core_Transaction::PHASE_POST_COMMIT,
'twinglecampaign_postSave_campaign_update_callback',
[$dao->id, $dao->campaign_type_id]
);
}
}
}
// If the transaction is already finished, call the function directly
// If the transaction is already finished, call the function directly
else {
twinglecampaign_postSave_campaign_update_callback($dao->id, $dao->campaign_type_id);
}
}
else {
twinglecampaign_postSave_campaign_update_callback($dao->id, $dao->campaign_type_id);
CRM_Core_Transaction::addCallback(
CRM_Core_Transaction::PHASE_POST_COMMIT,
'twinglecampaign_postSave_campaign_update_callback',
[$dao->id, $dao->campaign_type_id]
);
}
}
// Remove no hook flag
unset($_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook']);