CRM-16888 - CiviSMS - fix templates not working with CiviSMS

diff --git a/CRM/Contact/Form/Task/SMSCommon.php b/CRM/Contact/Form/Task/SMSCommon.php
index 63ac2807a733797d89ff5ac8e4da67eaab676f68..17e990386902b4b8feb70243629a859923acb82c 100644 (file)
--- a/CRM/Contact/Form/Task/SMSCommon.php
+++ b/CRM/Contact/Form/Task/SMSCommon.php
@@ -327,8 +327,8 @@ class CRM_Contact_Form_Task_SMSCommon {
     }
 
     //Added for CRM-1393
-    if (!empty($fields['saveTemplate']) && empty($fields['saveTemplateName'])) {
-      $errors['saveTemplateName'] = ts("Enter name to save message template");
+    if (!empty($fields['SMSsaveTemplate']) && empty($fields['SMSsaveTemplateName'])) {
+      $errors['SMSsaveTemplateName'] = ts("Enter name to save message template");
     }
 
     return empty($errors) ? TRUE : $errors;
@@ -347,19 +347,20 @@ class CRM_Contact_Form_Task_SMSCommon {
     $fromSmsProviderId = $thisValues['sms_provider_id'];
 
     // process message template
-    if (!empty($thisValues['saveTemplate']) || !empty($thisValues['updateTemplate'])) {
+    if (!empty($thisValues['SMSsaveTemplate']) || !empty($thisValues['SMSupdateTemplate'])) {
       $messageTemplate = array(
         'msg_text' => $thisValues['sms_text_message'],
         'is_active' => TRUE,
+        'is_sms' => TRUE,
       );
 
-      if (!empty($thisValues['saveTemplate'])) {
-        $messageTemplate['msg_title'] = $thisValues['saveTemplateName'];
+      if (!empty($thisValues['SMSsaveTemplate'])) {
+        $messageTemplate['msg_title'] = $thisValues['SMSsaveTemplateName'];
         CRM_Core_BAO_MessageTemplate::add($messageTemplate);
       }
 
-      if (!empty($thisValues['template']) && !empty($thisValues['updateTemplate'])) {
-        $messageTemplate['id'] = $thisValues['template'];
+      if (!empty($thisValues['SMStemplate']) && !empty($thisValues['SMSupdateTemplate'])) {
+        $messageTemplate['id'] = $thisValues['SMStemplate'];
         unset($messageTemplate['msg_title']);
         CRM_Core_BAO_MessageTemplate::add($messageTemplate);
       }

diff --git a/templates/CRM/Contact/Form/Task/SMS.tpl b/templates/CRM/Contact/Form/Task/SMS.tpl
index 41f7e365a536082a3c842275bbecaa7c5dfa014a..e458accabf47d82afee24fd4403655363a5c9138 100644 (file)
--- a/templates/CRM/Contact/Form/Task/SMS.tpl
+++ b/templates/CRM/Contact/Form/Task/SMS.tpl
@@ -59,8 +59,8 @@
 
 {if $SMSTask}
     <tr class="crm-contactPhone-form-block-template">
-        <td class="label">{$form.template.label}</td>
-        <td>{$form.template.html}</td>
+        <td class="label">{$form.SMStemplate.label}</td>
+        <td>{$form.SMStemplate.html}</td>
     </tr>
 {/if}