CRM-15854 - crmMailing, crmMailingAB - Respect 'delete in CiviMail' permission

[civicrm-core.git] / partials / crmMailing / edit-unified2.html

diff --git a/partials/crmMailing/edit-unified2.html b/partials/crmMailing/edit-unified2.html
index e5ea4994458e27d31f71f28b00fc6751005133c6..7f1ef824a2f812b2a7212718422033e1212ab300 100644 (file)
--- a/partials/crmMailing/edit-unified2.html
+++ b/partials/crmMailing/edit-unified2.html
@@ -6,7 +6,7 @@
   {{ts('This mailing has been submitted.')}}
 </div>
 
-<form name="crmMailing" ng-hide="isSubmitted()" crm-autosave="save()" crm-autosave-model="mailing">
+<form name="crmMailing" novalidate ng-hide="isSubmitted()">
   <div class="crm-block crm-form-block crmMailing">
 
     <div crm-mailing-block-summary crm-mailing="mailing"/>
@@ -15,9 +15,10 @@
     <div crm-ui-accordion crm-title="ts('HTML')">
       <div crm-mailing-body-html crm-mailing="mailing"/>
     </div>
-    <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
+    <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='!mailing.body_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-accordion id="tab-header" crm-title="ts('Header and Footer')" crm-collapsed='true'>
       <div crm-mailing-block-header-footer crm-mailing="mailing"/>
     </div>
@@ -40,8 +41,13 @@
       <div crm-mailing-block-schedule crm-mailing="mailing"/>
     </div>
 
-    <button ng-disabled="block.check()" ng-click="submit()">{{ts('Submit Mailing')}}</button>
-    <button ng-disabled="block.check()" ng-click="save()">{{ts('Save Draft')}}</button>
-    <button ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to delete the draft mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
+    <button crm-icon="check" ng-disabled="block.check() || crmMailing.$invalid" ng-click="submit()">{{ts('Submit Mailing')}}</button>
+    <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+    <button
+      crm-icon="trash"
+      ng-show="checkPerm('delete in CiviMail')"
+      ng-disabled="block.check()"
+      crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"
+      on-yes="delete()">{{ts('Delete Draft')}}</button>
   </div>
 </form>