Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-20299 - CiviMail UI - Cleanup "Location Type" and "Selection Method" #10014

Merged
merged 2 commits into from
Mar 19, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
CRM-20299 - CiviMail - "Location Type" requirement feels wonky
If you select a "Location Type" and then deselect it, the field changes
to "Automatic". This is the default value (which is acceptable), but the UI
flags it as erroneous.

The "Selection Method" also defaults to "Automatic".  These fields are oddly
a bit different (e.g.  "Automatic" translates to `location_type_id==null`
and `email_selection_method=automatic`), so the fields are a little
different, but this revision brings them closer.
totten committed Mar 17, 2017
commit beaddff331ed475f1e9bc71e38aa90d1ab8aa1c4
3 changes: 0 additions & 3 deletions ang/crmMailing/EditRecipOptionsDialogCtrl.html
Original file line number Diff line number Diff line change
@@ -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>