CRM-15856 - crmMailing - Validate that body_html *or* body_text is defined

diff --git a/partials/crmMailing/edit-unified.html b/partials/crmMailing/edit-unified.html
index 1e49628338e690f438a5435b645b7930f749861c..679a54659f16a48c9590dd5d0a044ba5c5ad98b8 100644 (file)
--- a/partials/crmMailing/edit-unified.html
+++ b/partials/crmMailing/edit-unified.html
@@ -19,6 +19,7 @@
       <div crm-ui-tab id="tab-text" crm-title="ts('Plain Text')">
         <div crm-mailing-body-text crm-mailing="mailing"/>
       </div>
+      <span ng-model="placeholder" crm-ui-validate="mailing.body_html || mailing.body_text"></span>
       <div crm-ui-tab id="tab-attachment" crm-title="ts('Attachments')">
         <div crm-attachments="attachments"/>
       </div>

diff --git a/partials/crmMailing/edit-unified2.html b/partials/crmMailing/edit-unified2.html
index 95aa25236afdad92a5ad2a6e7d690bba8ccb7871..acba888bb5ed87f5b1cc52add3c3893a3d193b29 100644 (file)
--- a/partials/crmMailing/edit-unified2.html
+++ b/partials/crmMailing/edit-unified2.html
@@ -18,6 +18,7 @@
     <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
       <div crm-mailing-body-text crm-mailing="mailing"/>
     </div>
+    <span ng-model="placeholder" crm-ui-validate="mailing.body_html || mailing.body_text"></span>
     <div crm-ui-accordion id="tab-header" crm-title="ts('Header and Footer')" crm-collapsed='true'>
       <div crm-mailing-block-header-footer crm-mailing="mailing"/>
     </div>

diff --git a/partials/crmMailing/edit-wizard.html b/partials/crmMailing/edit-wizard.html
index ccde73a4928d0a02314970efb0b7d3283108d21b..fec3c676dfca48ba10badaf4a9a8ac1ed3993c5f 100644 (file)
--- a/partials/crmMailing/edit-wizard.html
+++ b/partials/crmMailing/edit-wizard.html
@@ -23,6 +23,7 @@
         <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
           <div crm-mailing-body-text crm-mailing="mailing"/>
         </div>
+        <span ng-model="placeholder" crm-ui-validate="mailing.body_html || mailing.body_text"></span>
         <div crm-ui-accordion crm-title="ts('Header and Footer')" crm-collapsed="true">
           <div crm-mailing-block-header-footer crm-mailing="mailing"/>
         </div>

diff --git a/partials/crmMailing/edit.html b/partials/crmMailing/edit.html
index eb65d0117b9e8f7d174d7abdb0c5f5deca1f4420..edb3627e4464c766e87515f16a68f2449d34fe7e 100644 (file)
--- a/partials/crmMailing/edit.html
+++ b/partials/crmMailing/edit.html
@@ -23,6 +23,7 @@
             <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
               <div crm-mailing-body-text crm-mailing="mailing"/>
             </div>
+            <span ng-model="placeholder" crm-ui-validate="mailing.body_html || mailing.body_text"></span>
           </div>
           <div crm-ui-tab id="tab-attachment" crm-title="ts('Attachments')">
             <div crm-attachments="attachments"/>