Skip to content
Snippets Groups Projects
Commit 1adb29ea authored by lobo's avatar lobo
Browse files

Merge pull request #409 from dlobo/CRM-12334

CRM-12334 formatting and always assign a value
parents d65de14c 0086c33d
No related branches found
No related tags found
No related merge requests found
......@@ -407,7 +407,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
$urlParams .= "&qfKey=$qfKey";
}
$path = CRM_Utils_System::currentPath();
if ($this->_compContext == 'advanced' ||
if ($this->_compContext == 'advanced' ||
$path == 'civicrm/contact/search/advanced') {
$urlString = 'civicrm/contact/search/advanced';
}
......@@ -886,10 +886,15 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
$this->addFormRule(array('CRM_Activity_Form_Activity', 'formRule'), $this);
if ( CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
'activity_assignee_notification' )
if (CRM_Core_BAO_Setting::getItem(
CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
'activity_assignee_notification'
)
) {
$this->assign('activityAssigneeNotification', true);
$this->assign('activityAssigneeNotification', TRUE);
}
else {
$this->assign('activityAssigneeNotification', FALSE);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment