[Ref] Move rule to email trait

This is part of dis-establishing EmailCommon - the function is not called from elsewhere

diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
index b4487ff17b1e0c98c1b589b5909f096ba29e082f..e154cbf8b4667afdb6fe5465fe3204aff68ba3d9 100644 (file)
--- a/CRM/Contact/Form/Task/EmailCommon.php
+++ b/CRM/Contact/Form/Task/EmailCommon.php
@@ -81,6 +81,7 @@ class CRM_Contact_Form_Task_EmailCommon {
    *   true if no errors, else array of errors
    */
   public static function formRule(array $fields) {
+    CRM_Core_Error::deprecatedFunctionWarning('no replacement');
     $errors = [];
     //Added for CRM-1393
     if (!empty($fields['saveTemplate']) && empty($fields['saveTemplateName'])) {

diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php
index df222411a1a7d3263a03b6ae968570a2a0ab16ff..bd27b78259bc06594a7b38ace5bfe0018f3db03b 100644 (file)
--- a/CRM/Contact/Form/Task/EmailTrait.php
+++ b/CRM/Contact/Form/Task/EmailTrait.php
@@ -331,7 +331,7 @@ trait CRM_Contact_Form_Task_EmailTrait {
     //Added for CRM-15984: Add campaign field
     CRM_Campaign_BAO_Campaign::addCampaign($this);
 
-    $this->addFormRule(['CRM_Contact_Form_Task_EmailCommon', 'formRule'], $this);
+    $this->addFormRule([__CLASS__, 'saveTemplateFormRule'], $this);
     CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'templates/CRM/Contact/Form/Task/EmailCommon.js', 0, 'html-header');
   }
 
@@ -644,4 +644,22 @@ trait CRM_Contact_Form_Task_EmailTrait {
     return $followupStatus;
   }
 
+  /**
+   * Form rule.
+   *
+   * @param array $fields
+   *   The input form values.
+   *
+   * @return bool|array
+   *   true if no errors, else array of errors
+   */
+  public static function saveTemplateFormRule(array $fields) {
+    $errors = [];
+    //Added for CRM-1393
+    if (!empty($fields['saveTemplate']) && empty($fields['saveTemplateName'])) {
+      $errors['saveTemplateName'] = ts('Enter name to save message template');
+    }
+    return empty($errors) ? TRUE : $errors;
+  }
+
 }