darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-02 07:27:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2214 from alphagov/sort-services-alpha-on-copy

Browse Source 
Sort services alphabetically when copying template
This commit is contained in:
Chris Hill-Scott
2018-08-10 16:59:00 +01:00
committed by GitHub
parent 5b616d55db 55d051d95a
commit ec69aa6c39
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/notify_client/user_api_client.py
View File

@@ -214,9 +214,10 @@ class UserApiClient(NotifyAdminAPIClient):
def get_services_for_user(self, user):
orgs_and_services_for_user = self.get_organisations_and_services_for_user(user)
return orgs_and_services_for_user['services_without_organisations'] + next(chain(
all_services = orgs_and_services_for_user['services_without_organisations'] + next(chain(
org['services'] for org in orgs_and_services_for_user['organisations']
), [])
return sorted(all_services, key=lambda service: service['name'])
def get_service_ids_for_user(self, user):
return {

30
tests/app/main/views/test_templates.py
View File

@@ -476,21 +476,6 @@ def test_choose_a_template_to_copy(
assert normalize_spaces(
page.select_one('main nav').text
) == normalize_spaces(
'Service 1 '
' sms_template_one '
' Text message template'
' sms_template_two Text message template'
' email_template_one Email template'
' email_template_two Email template '
'Service 2 '
' sms_template_one'
' Text message template'
' sms_template_two'
' Text message template'
' email_template_one'
' Email template'
' email_template_two'
' Email template '
'Org 1 service 1 '
' sms_template_one'
' Text message template'
@@ -508,6 +493,21 @@ def test_choose_a_template_to_copy(
' email_template_one'
' Email template'
' email_template_two'
' Email template '
'Service 1 '
' sms_template_one '
' Text message template'
' sms_template_two Text message template'
' email_template_one Email template'
' email_template_two Email template '
'Service 2 '
' sms_template_one'
' Text message template'
' sms_template_two'
' Text message template'
' email_template_one'
' Email template'
' email_template_two'
' Email template'
)