From c9ae63bbff0bc3df66c1d26ee288662778a2ef0f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 23 Jan 2015 22:32:31 -0800
Subject: [PATCH] CRM-15856 - crmMailing - Disable "Submit Mailing" until the
 form is valid.

---
 css/angular-crmMailing.css             | 12 ++++++++++++
 js/angular-crmMailing.js               |  4 ++++
 partials/crmMailing/edit-unified.html  |  2 +-
 partials/crmMailing/edit-unified2.html |  2 +-
 partials/crmMailing/edit-wizard.html   |  2 +-
 partials/crmMailing/edit.html          |  2 +-
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/css/angular-crmMailing.css b/css/angular-crmMailing.css
index 0e575573cc..791a281eae 100644
--- a/css/angular-crmMailing.css
+++ b/css/angular-crmMailing.css
@@ -87,6 +87,18 @@ a.crmMailing-submit-button div:hover {
 a.crmMailing-submit-button:hover {
   text-decoration: none;
 }
+a.crmMailing-submit-button.disabled div {
+  color: black;
+  background: #aaa;
+  border: 1px solid #8a8;
+  padding: 1em;
+  margin: 1em;
+  width: 15em;
+}
+a.crmMailing-submit-button.disabled div:hover {
+  background: #aaa;
+  border: 1px solid #7a7;
+}
 
 .crm-container .ui-widget {
   font-size: 13px;
diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index d62443a12d..c4f505560f 100644
--- a/js/angular-crmMailing.js
+++ b/js/angular-crmMailing.js
@@ -95,6 +95,10 @@
 
     // @return Promise
     $scope.submit = function submit() {
+      if (block.check() || $scope.crmMailing.$invalid) {
+        return;
+      }
+
       var promise = crmMailingMgr.save($scope.mailing)
           .then(function () {
             // pre-condition: the mailing exists *before* saving attachments to it
diff --git a/partials/crmMailing/edit-unified.html b/partials/crmMailing/edit-unified.html
index 679a54659f..6e46a03ff3 100644
--- a/partials/crmMailing/edit-unified.html
+++ b/partials/crmMailing/edit-unified.html
@@ -45,7 +45,7 @@
       <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() || crmMailing.$invalid" 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>
   </div>
diff --git a/partials/crmMailing/edit-unified2.html b/partials/crmMailing/edit-unified2.html
index acba888bb5..eee356fd51 100644
--- a/partials/crmMailing/edit-unified2.html
+++ b/partials/crmMailing/edit-unified2.html
@@ -41,7 +41,7 @@
       <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() || crmMailing.$invalid" 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>
   </div>
diff --git a/partials/crmMailing/edit-wizard.html b/partials/crmMailing/edit-wizard.html
index fec3c676df..0a05f22e58 100644
--- a/partials/crmMailing/edit-wizard.html
+++ b/partials/crmMailing/edit-wizard.html
@@ -56,7 +56,7 @@
           <div crm-mailing-block-review crm-mailing="mailing"/>
         </div>
         <center>
-          <a class="crmMailing-submit-button" ng-click="submit()" ng-disabled="block.check()">
+          <a class="crmMailing-submit-button" ng-click="submit()" ng-class="{disabled: block.check() || crmMailing.$invalid}">
             <div>{{ts('Submit Mailing')}}</div>
           </a>
         </center>
diff --git a/partials/crmMailing/edit.html b/partials/crmMailing/edit.html
index edb3627e44..adac47dd88 100644
--- a/partials/crmMailing/edit.html
+++ b/partials/crmMailing/edit.html
@@ -53,7 +53,7 @@
           <div crm-mailing-block-schedule crm-mailing="mailing"/>
         </div>
         <center>
-          <a class="crmMailing-submit-button" ng-click="submit()" ng-disabled="block.check()">
+          <a class="crmMailing-submit-button" ng-click="submit()" ng-class="{disabled: block.check() || crmMailing.$invalid}">
             <div>{{ts('Submit Mailing')}}</div>
           </a>
         </center>
-- 
2.25.1