projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e303faa
)
CRM-16839 - Simpler status msg
author
colemanw
<coleman@civicrm.org>
Tue, 14 Jul 2015 18:58:55 +0000
(14:58 -0400)
committer
colemanw
<coleman@civicrm.org>
Tue, 14 Jul 2015 18:58:55 +0000
(14:58 -0400)
CRM/Case/Form/Activity.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Case/Form/Activity.php
b/CRM/Case/Form/Activity.php
index 4f60f56b7d4c808d0553998a984ff36b1c8c701b..b528ea704c6a758b29b47dd566d2e0e431fabdf4 100644
(file)
--- a/
CRM/Case/Form/Activity.php
+++ b/
CRM/Case/Form/Activity.php
@@
-430,9
+430,6
@@
class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
$params['parent_id'] = $parentId;
}
$params['parent_id'] = $parentId;
}
- // required for status msg
- $recordStatus = ts("The '%1' activity has been created.", array(1 => $this->_activityTypeName));
-
// store the dates with proper format
$params['activity_date_time'] = CRM_Utils_Date::processDate($params['activity_date_time'], $params['activity_date_time_time']);
$params['activity_type_id'] = $this->_activityTypeId;
// store the dates with proper format
$params['activity_date_time'] = CRM_Utils_Date::processDate($params['activity_date_time'], $params['activity_date_time_time']);
$params['activity_type_id'] = $this->_activityTypeId;
@@
-500,9
+497,6
@@
class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
if (empty($params['target_contact_id']) && !empty($this->_defaults['target_contact'])) {
$newActParams['target_contact_id'] = $this->_defaults['target_contact'];
}
if (empty($params['target_contact_id']) && !empty($this->_defaults['target_contact'])) {
$newActParams['target_contact_id'] = $this->_defaults['target_contact'];
}
-
- // record status for status msg
- $recordStatus = ts("The '%1' activity has been updated.", array(1 => $this->_activityTypeName));
}
if (!isset($newActParams)) {
}
if (!isset($newActParams)) {
@@
-695,11
+689,11
@@
class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
'case_id' => $vval['case_id'],
);
CRM_Case_BAO_Case::processCaseActivity($caseParams);
'case_id' => $vval['case_id'],
);
CRM_Case_BAO_Case::processCaseActivity($caseParams);
- $followupStatus = ts("A followup activity has been scheduled.");
+ $followupStatus = ts("A followup activity has been scheduled.")
. '<br /><br />'
;
}
}
}
}
-
- CRM_Core_Session::setStatus(
'', $recordStatus . ' ' . $followupStatus . ' ' . $mailStatus
, 'info');
+ $title = ts("%1 Saved", array(1 => $this->_activityTypeName));
+ CRM_Core_Session::setStatus(
$followupStatus . $mailStatus, $title
, 'info');
}
}
}
}