Merge pull request #10014 from totten/master-email-recip

CRM-20299 - CiviMail UI - Cleanup "Location Type" and "Selection Method"
civicrm · Mar 19, 2017 · 714ec13 · 714ec13
2 parents ad16923 + beaddff
commit 714ec13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ang/crmMailing/EditRecipCtrl.js b/ang/crmMailing/EditRecipCtrl.js
@@ -46,6 +46,8 @@
       });
     }, RECIPIENTS_DEBOUNCE_MS);
     $scope.$watchCollection("mailing.dedupe_email", refreshRecipients);
+    $scope.$watchCollection("mailing.location_type_id", refreshRecipients);
+    $scope.$watchCollection("mailing.email_selection_method", refreshRecipients);
     $scope.$watchCollection("mailing.recipients.groups.include", refreshRecipients);
     $scope.$watchCollection("mailing.recipients.groups.exclude", refreshRecipients);
     $scope.$watchCollection("mailing.recipients.mailings.include", refreshRecipients);

diff --git a/ang/crmMailing/EditRecipOptionsDialogCtrl.html b/ang/crmMailing/EditRecipOptionsDialogCtrl.html
@@ -17,9 +17,7 @@
           crm-ui-select="{dropdownAutoWidth : true}"
           name="location_type_id"
           ng-model="model.mailing.location_type_id"
-          required
           >
-
           <option value="">{{ts('Automatic')}}</option>
           <option ng-repeat="locType in model.fields.location_type_id.options"
                   ng-value="locType.key">{{locType.value}}</option>
@@ -32,7 +30,6 @@
           crm-ui-select=""
           name="email_selection_method"
           ng-model="model.mailing.email_selection_method"
-          required
           >
           <option ng-repeat="selMet in model.fields.email_selection_method.options"
                   ng-value="selMet.key">{{selMet.value}}</option>