From: Tim Otten <totten@civicrm.org>
Date: Sat, 24 Jan 2015 06:28:52 +0000 (-0800)
Subject: CRM-15856 - crmMailing - Validate that body_html *or* body_text is defined
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0d65c1c20f19b9314b799331daf38cd8e78c2417;p=civicrm-core.git

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 1e49628338..679a54659f 100644
--- 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 95aa25236a..acba888bb5 100644
--- 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 ccde73a492..fec3c676df 100644
--- 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 eb65d0117b..edb3627e44 100644
--- 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"/>