darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 10:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sort email branding selection alphabetically

Browse Source 
For branding combinations in service settings and
branding creation/editing in platform admin.
This commit is contained in:
Tom Byers
2018-08-15 16:13:27 +01:00
parent 85ec7a28cb
commit 853f13c70b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/email_branding.py
+2 -1
View File
@@ -29,7 +29,8 @@ def email_branding():
brandings = email_branding_client.get_all_email_branding() brandings = email_branding_client.get_all_email_branding()
form = ServiceSelectEmailBranding() form = ServiceSelectEmailBranding()
form.email_branding.choices = get_branding_as_value_and_label(brandings) + [('None', 'Create a new email branding')] email_brandings = sorted(get_branding_as_value_and_label(brandings), key=lambda tup: tup[1].lower())
form.email_branding.choices = email_brandings + [('None', 'Create a new email branding')]
if form.validate_on_submit(): if form.validate_on_submit():
if form.email_branding.data != 'None': if form.email_branding.data != 'None':
app/main/views/service_settings.py
+3 -1
View File
@@ -872,7 +872,9 @@ def service_set_email_branding(service_id):
form = ServiceSetBranding(branding_type=branding_type) form = ServiceSetBranding(branding_type=branding_type)
# dynamically create org choices, including the null option # dynamically create org choices, including the null option
form.branding_style.choices = [('None', 'None')] + get_branding_as_value_and_label(email_branding) email_brandings = sorted(get_branding_as_value_and_label(email_branding),
key=lambda tup: tup[1].lower())
form.branding_style.choices = [('None', 'None')] + email_brandings
if form.validate_on_submit(): if form.validate_on_submit():
branding_style = None if form.branding_style.data == 'None' else form.branding_style.data branding_style = None if form.branding_style.data == 'None' else form.branding_style.data