worked on CRM-12202, localized buttons and removed unwanted variables

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 181c013dde5f5f1f361854df4a3925161b0088e4..a2a71ff0c682a1e1acf731b6160c2a040fa232f2 100644 (file)
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1287,7 +1287,7 @@ SELECT case_status.label AS case_status, status_id, case_type.label AS case_type
       }
 
       if ($allowEdit) {
-        $values[$dao->id]['status'] = '<a class="crm-activity-status crm-activity-status-' . $dao->id . ' ' . $values[$dao->id]['class'] . ' crm-activity-change-status" activity_id='. $dao->id. ' contact_id=' . $contactID . ' current_status=' . $dao->status . ' case_id=' . $caseID . '" href="#" title=\'' . $statusTitle . '\'>' . $values[$dao->id]['status'] . '</a>';
+        $values[$dao->id]['status'] = '<a class="crm-activity-status crm-activity-status-' . $dao->id . ' ' . $values[$dao->id]['class'] . ' crm-activity-change-status" activity_id='. $dao->id. ' current_status=' . $dao->status . ' case_id=' . $caseID . '" href="#" title=\'' . $statusTitle . '\'>' . $values[$dao->id]['status'] . '</a>';
       }
     }
     $dao->free();

diff --git a/templates/CRM/Case/Form/ActivityChangeStatus.js b/templates/CRM/Case/Form/ActivityChangeStatus.js
index 3273b4905b6ef296f57416f187251c88776c51fe..cee2acd5d588f9c6a3fbfe2e38b018c0dfcdbf48 100644 (file)
--- a/templates/CRM/Case/Form/ActivityChangeStatus.js
+++ b/templates/CRM/Case/Form/ActivityChangeStatus.js
@@ -3,14 +3,53 @@ cj(function($) {
   $('.crm-container').on('click', 'a.crm-activity-change-status', function() {
     changeActivityStatus(
       $(this).attr('activity_id'),
-      $(this).attr('contact_id'),
       $(this).attr('current_status'),
       $(this).attr('case_id')
     );
     return false;
   });
 
-  function changeActivityStatus(activityId, contactId, current_status_id, caseId) {
+  function changeActivityStatus(activityId, current_status_id, caseId) {
+    var buttons = {};
+    buttons[ts('Ok')] = function() {
+      // update the status
+      var status_id = $("#activity_change_status").val( );
+      if (status_id === current_status_id) {
+        $(this).dialog('close').remove();
+        return false;
+      }
+
+      var dataUrl = CRM.url('civicrm/ajax/rest');
+      var data = 'json=1&version=3&entity=Activity&action=update&id=' + activityId + '&status_id=' + status_id
+        + '&case_id=' + caseId;
+      $.ajax({
+        type     : 'POST',
+        dataType : 'json',
+        url      : dataUrl,
+        data     : data,
+        success  : function(values) {
+          if (values.is_error) {
+            CRM.alert(values.error_message, ts('Unable to change status'), 'error');
+            return false;
+          }
+          else {
+            // just reload the page on success
+            window.location.reload();
+          }
+        },
+        error : function(jqXHR, textStatus) {
+          CRM.alert(jqXHR.responseText, jqXHR.statusText, 'error');
+          return false;
+        }
+      });
+
+      $(this).dialog('close').remove();
+    };
+
+    buttons[ts('Cancel')] = function() {
+      $(this).dialog('close').remove();
+    };
+
     var data = 'snippet=1&reset=1';
     $('<div>')
       .load(CRM.url('civicrm/case/changeactivitystatus'), data, function() {
@@ -19,48 +58,7 @@ cj(function($) {
       .dialog({
         modal: true,
         title: ts('Change Activity Status'),
-        buttons: {
-          "Ok" : function() {
-            // update the status
-            var status_id = $("#activity_change_status").val( );
-
-            if (status_id === current_status_id) {
-              $(this).dialog('close').remove();
-              return false;
-            }
-
-            var dataUrl = CRM.url('civicrm/ajax/rest');
-            var data = 'json=1&version=3&entity=Activity&action=update&id=' + activityId + '&status_id=' + status_id
-              + '&case_id=' + caseId;
-            $.ajax({
-              type     : "POST",
-              dataType : "json",
-              url      : dataUrl,
-              data     : data,
-              success  : function( values ) {
-                if ( values.is_error ) {
-                  // seems to be some discrepancy as to which spelling it should be
-                  var err_msg = values.error_msg ? values.error_msg : values.error_message;
-                  CRM.alert(err_msg, ts('Unable to change status'), 'error');
-                  return false;
-                }
-                else {
-                  // just reload the page on success
-                  window.location.reload();
-                }
-              },
-              error    : function( jqXHR, textStatus ) {
-                CRM.alert(jqXHR.responseText, jqXHR.statusText, 'error');
-                return false;
-              }
-            });
-
-            $(this).dialog('close').remove();
-          },
-          "Cancel": function() {
-            $(this).dialog('close').remove();
-          }
-        },
+        buttons: buttons,
         beforeClose: function() {
           $(this).dialog("destroy");
         }