👾 fix bug: #2 CiviCRM Error on independent API Call on campaign
Thanks to @iTobi for reporting the bug!
This commit is contained in:
Marc Michalsky
parent
9ad97c11e1
commit
397ba57343
1 changed files with 95 additions and 91 deletions
|
|
@ -59,42 +59,53 @@ function twinglecampaign_civicrm_config(&$config) {
|
||||||
*/
|
*/
|
||||||
function twinglecampaign_civicrm_postSave_civicrm_campaign($dao) {
|
function twinglecampaign_civicrm_postSave_civicrm_campaign($dao) {
|
||||||
|
|
||||||
if (empty($_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook']) ||
|
$twingle_project_campaign_type_id = _get_campaign_type_id_twingle_project();
|
||||||
$_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook'] != TRUE) {
|
$twingle_campaign_campaign_type_id = _get_campaign_type_id_twingle_campaign();
|
||||||
|
|
||||||
// If request is not an API-Call
|
// If $campaign_type_id is a TwingleProject or TwingleCampaign campaign,
|
||||||
if ($_GET['action'] != 'create') {
|
// synchronize it
|
||||||
|
if (
|
||||||
|
$dao->campaign_type_id == $twingle_project_campaign_type_id ||
|
||||||
|
$dao->campaign_type_id == $twingle_campaign_campaign_type_id
|
||||||
|
) {
|
||||||
|
|
||||||
// If the db transaction is still running, add a function to it that will
|
if (empty($_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook']) ||
|
||||||
// be called afterwards
|
$_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook'] != TRUE) {
|
||||||
if (CRM_Core_Transaction::isActive()) {
|
|
||||||
|
|
||||||
if (_validateAndSendInput($dao->id, $dao->campaign_type_id)) {
|
// If request is not an API-Call
|
||||||
|
if ($_GET['action'] != 'create' && $_POST['action'] != 'create') {
|
||||||
|
|
||||||
CRM_Core_Transaction::addCallback(
|
// If the db transaction is still running, add a function to it that will
|
||||||
CRM_Core_Transaction::PHASE_POST_COMMIT,
|
// be called afterwards
|
||||||
'twinglecampaign_postSave_campaign_update_callback',
|
if (CRM_Core_Transaction::isActive()) {
|
||||||
[$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]
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// 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 {
|
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]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
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']);
|
||||||
}
|
}
|
||||||
// Remove no hook flag
|
|
||||||
unset($_SESSION['CiviCRM']['de.forumzfd.twinglecampaign']['no_hook']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -115,78 +126,70 @@ function twinglecampaign_postSave_campaign_update_callback(
|
||||||
$twingle_project_campaign_type_id = _get_campaign_type_id_twingle_project();
|
$twingle_project_campaign_type_id = _get_campaign_type_id_twingle_project();
|
||||||
$twingle_campaign_campaign_type_id = _get_campaign_type_id_twingle_campaign();
|
$twingle_campaign_campaign_type_id = _get_campaign_type_id_twingle_campaign();
|
||||||
|
|
||||||
// If $campaign_type_id is a TwingleProject or TwingleCampaign campaign,
|
// Set $entity for $campaign_type_id
|
||||||
// synchronize it
|
if ($campaign_type_id == $twingle_project_campaign_type_id) {
|
||||||
if (
|
$entity = 'TwingleProject';
|
||||||
$campaign_type_id == $twingle_project_campaign_type_id ||
|
}
|
||||||
$campaign_type_id == $twingle_campaign_campaign_type_id
|
else {
|
||||||
) {
|
$entity = 'TwingleCampaign';
|
||||||
|
}
|
||||||
|
|
||||||
// Set $entity for $campaign_type_id
|
if (isset($_POST['action'])) {
|
||||||
if ($campaign_type_id == $twingle_project_campaign_type_id) {
|
if ($_POST['action'] == 'clone' && $entity == 'TwingleProject') {
|
||||||
$entity = 'TwingleProject';
|
$_POST['action'] = 'create';
|
||||||
}
|
$result = civicrm_api3('TwingleProject', 'getsingle',
|
||||||
else {
|
['id' => $campaign_id]
|
||||||
$entity = 'TwingleCampaign';
|
);
|
||||||
}
|
$id = $result['id'];
|
||||||
|
unset($result['id']);
|
||||||
if (isset($_POST['action'])) {
|
$project = new TwingleProject($result, $id);
|
||||||
if ($_POST['action'] == 'clone' && $entity == 'TwingleProject') {
|
|
||||||
unset($_POST['action']);
|
|
||||||
$result = civicrm_api3('TwingleProject', 'getsingle',
|
|
||||||
['id' => $campaign_id]
|
|
||||||
);
|
|
||||||
$id = $result['id'];
|
|
||||||
unset($result['id']);
|
|
||||||
$project = new TwingleProject($result, $id);
|
|
||||||
try {
|
|
||||||
$project->clone();
|
|
||||||
} catch (Exception $e) {
|
|
||||||
Civi::log()->error(
|
|
||||||
E::LONG_NAME .
|
|
||||||
' could not clone ' . $entity . ': ' . $e->getMessage()
|
|
||||||
);
|
|
||||||
CRM_Core_Session::setStatus(
|
|
||||||
$e->getMessage(),
|
|
||||||
E::ts("Campaign cloning failed"),
|
|
||||||
error,
|
|
||||||
[unique => TRUE]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If a TwingleProject is getting saved
|
|
||||||
elseif ($entity == 'TwingleProject') {
|
|
||||||
|
|
||||||
// Synchronize all child TwingleCampaign campaigns
|
|
||||||
try {
|
try {
|
||||||
civicrm_api3(
|
$project->clone();
|
||||||
'TwingleCampaign',
|
} catch (Exception $e) {
|
||||||
'sync',
|
Civi::log()->error(
|
||||||
['parent_id' => $campaign_id]);
|
E::LONG_NAME .
|
||||||
} catch (CiviCRM_API3_Exception $e) {
|
' could not clone ' . $entity . ': ' . $e->getMessage()
|
||||||
|
);
|
||||||
CRM_Core_Session::setStatus(
|
CRM_Core_Session::setStatus(
|
||||||
$e->getMessage(),
|
$e->getMessage(),
|
||||||
E::ts("TwingleCampaign update failed"),
|
E::ts("Campaign cloning failed"),
|
||||||
error, [unique => TRUE]
|
error,
|
||||||
);
|
[unique => TRUE]
|
||||||
Civi::log()->error(
|
|
||||||
E::SHORT_NAME .
|
|
||||||
' Update of TwingleCampaigns failed: ' . $e->getMessage()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
}
|
||||||
try {
|
|
||||||
civicrm_api3('TwingleCampaign', 'create',
|
// If a TwingleProject is getting saved
|
||||||
['id' => $campaign_id, 'parent_id' => $_POST['parent_id']]);
|
elseif ($entity == 'TwingleProject') {
|
||||||
CRM_Utils_System::setUFMessage(E::ts('TwingleCampaign was saved.'));
|
|
||||||
} catch (CiviCRM_API3_Exception $e) {
|
// Synchronize all child TwingleCampaign campaigns
|
||||||
Civi::log()->error(
|
try {
|
||||||
'twinglecampaign_postSave_callback ' . $e->getMessage()
|
civicrm_api3(
|
||||||
);
|
'TwingleCampaign',
|
||||||
}
|
'sync',
|
||||||
|
['parent_id' => $campaign_id]);
|
||||||
|
} catch (CiviCRM_API3_Exception $e) {
|
||||||
|
CRM_Core_Session::setStatus(
|
||||||
|
$e->getMessage(),
|
||||||
|
E::ts("TwingleCampaign update failed"),
|
||||||
|
error, [unique => TRUE]
|
||||||
|
);
|
||||||
|
Civi::log()->error(
|
||||||
|
E::SHORT_NAME .
|
||||||
|
' Update of TwingleCampaigns failed: ' . $e->getMessage()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
try {
|
||||||
|
civicrm_api3('TwingleCampaign', 'create',
|
||||||
|
['id' => $campaign_id, 'parent_id' => $_POST['parent_id']]);
|
||||||
|
CRM_Utils_System::setUFMessage(E::ts('TwingleCampaign was saved.'));
|
||||||
|
} catch (CiviCRM_API3_Exception $e) {
|
||||||
|
Civi::log()->error(
|
||||||
|
'twinglecampaign_postSave_callback ' . $e->getMessage()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -203,6 +206,7 @@ function _get_campaign_type_id_twingle_campaign() {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callback to sync a project after its creation.
|
* Callback to sync a project after its creation.
|
||||||
|
*
|
||||||
* @param int $campaign_id
|
* @param int $campaign_id
|
||||||
*/
|
*/
|
||||||
function twinglecampaign_postSave_project_create_callback(
|
function twinglecampaign_postSave_project_create_callback(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue