Commit e517eb43 authored by mattwire's avatar mattwire

Remove activitystatus js. Add submitOnce handler for activity create

parent 1eca040f
......@@ -792,31 +792,26 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
// form should be frozen for view mode
$this->freeze();
$buttons = array();
$buttons[] = array(
'type' => 'cancel',
'name' => ts('Done'),
);
$this->addButtons($buttons);
$this->addButtons([
[
'type' => 'cancel',
'name' => ts('Done'),
],
]);
}
else {
$message = array(
'completed' => ts('Are you sure? This is a COMPLETED activity with the DATE in the FUTURE. Click Cancel to change the date / status. Otherwise, click OK to save.'),
'scheduled' => ts('Are you sure? This is a SCHEDULED activity with the DATE in the PAST. Click Cancel to change the date / status. Otherwise, click OK to save.'),
);
$js = array('onclick' => "return activityStatus(" . json_encode($message) . ");");
$this->addButtons(array(
array(
$this->addButtons([
[
'type' => 'upload',
'name' => ts('Save'),
'js' => $js,
'isDefault' => TRUE,
),
array(
'submitOnce' => TRUE,
],
[
'type' => 'cancel',
'name' => ts('Cancel'),
),
));
],
]);
}
if ($this->_activityTypeFile) {
......
......@@ -32,8 +32,6 @@
{/if}
<div class="crm-block crm-form-block crm-activity-form-block">
{/if}
{* added onload javascript for source contact*}
{include file="CRM/Activity/Form/ActivityJs.tpl" tokenContext="activity"}
{if !$action or ( $action eq 1 ) or ( $action eq 2 ) }
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{/if}
......
{*
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2019 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
{* added onload javascript for source contact*}
{literal}
<script type="text/javascript">
/**
* Function to check activity status in relavent to activity date
*
* @param message JSON object.
*/
function activityStatus(message) {
var activityDate = cj("#activity_date_time_display").datepicker('getDate');
if (activityDate) {
var
// Ignore time, only compare dates
today = new Date().setHours(0,0,0,0),
activityStatusId = cj('#status_id').val();
if (activityStatusId == 2 && today < activityDate) {
return confirm(message.completed);
}
else if (activityStatusId == 1 && today > activityDate) {
return confirm(message.scheduled);
}
}
}
</script>
{/literal}
......@@ -30,10 +30,6 @@
{if $action neq 8 and $action neq 32768 }
{* Include form buttons on top for new and edit modes. *}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{* added onload javascript for source contact*}
{include file="CRM/Activity/Form/ActivityJs.tpl" tokenContext="case_activity"}
{/if}
{if $action eq 8 or $action eq 32768 }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment