CRM-15856 - crmMailingRecipients - Respect ngRequired

diff --git a/js/angular-crmMailing/directives.js b/js/angular-crmMailing/directives.js
index d86fed8cfaae560e4d1e0cc89fa3eaa267aed1ea..1ba5449fbe065c6698fb3fea3704e78f0a663779 100644 (file)
--- a/js/angular-crmMailing/directives.js
+++ b/js/angular-crmMailing/directives.js
@@ -233,6 +233,7 @@
       scope: {
         crmAvailGroups: '@', // available groups
         crmAvailMailings: '@', // available mailings
+        ngRequired: '@'
       },
       templateUrl: '~/crmMailing/directive/recipients.html',
       link: function (scope, element, attrs, ngModel) {
@@ -289,6 +290,7 @@
           scope.recips = ngModel.$viewValue;
           if (ngModel.$viewValue) {
             $(element).select2('val', convertMailingToValues(ngModel.$viewValue));
+            validate();
           }
         };
 
@@ -304,6 +306,15 @@
           return "<img src='../../sites/all/modules/civicrm/i/" + icon + "' height=12 width=12 /> <span class='" + spanClass + "'>" + item.text + "</span>";
         }
 
+        function validate() {
+          if (scope.$parent.$eval(attrs.ngRequired)) {
+            var empty = (_.isEmpty(ngModel.$viewValue.groups.include) && _.isEmpty(ngModel.$viewValue.mailings.include));
+            ngModel.$setValidity('empty', !empty);
+          } else {
+            ngModel.$setValidity('empty', true);
+          }
+        }
+
         $(element).select2({
           dropdownAutoWidth: true,
           placeholder: "Groups or Past Recipients",
@@ -311,7 +322,7 @@
           formatSelection: formatItem,
           escapeMarkup: function (m) {
             return m;
-          },
+          }
         });
 
         $(element).on('select2-selecting', function (e) {
@@ -327,6 +338,7 @@
           }
           scope.$apply();
           $(element).select2('close');
+          validate();
           e.preventDefault();
         });
 
@@ -336,6 +348,7 @@
           scope.$parent.$apply(function () {
             arrayRemove(ngModel.$viewValue[typeKey][option.mode], option.entity_id);
           });
+          validate();
           e.preventDefault();
         });
 

diff --git a/partials/crmMailing/recipients.html b/partials/crmMailing/recipients.html
index 3306ef4aea2bac5c5926b3b69b102a0e81f80ed0..90d1918540e797355418c851cfe4064bd47664f7 100644 (file)
--- a/partials/crmMailing/recipients.html
+++ b/partials/crmMailing/recipients.html
@@ -22,7 +22,7 @@
     crm-avail-mailings="crmMailingConst.civiMails | filter:{is_completed:1}"
     crm-ui-id="{{crmMailingBlockRecipients.id}}"
     name="{{crmMailingBlockRecipients.name}}"
-    required
+    ng-required="true"
     multiple>
   </select>
 </div>