darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 08:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2987 from alphagov/org-trial-services

Browse Source 
move trial mode services from org dashboard to separate page
This commit is contained in:
Leo Hemsted
2019-05-30 11:19:17 +01:00
committed by GitHub
parent 378fec281a 4375c3d151
commit 3a1282d03f
9 changed files with 798 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main/views/service_settings.py
View File

@@ -1018,16 +1018,16 @@ def request_letter_branding(service_id):
@user_is_platform_admin
def link_service_to_organisation(service_id):
organisations = organisations_client.get_organisations()
current_organisation = organisations_client.get_service_organisation(service_id).get('id', None)
all_organisations = organisations_client.get_organisations()
current_linked_organisation = organisations_client.get_service_organisation(service_id).get('id', None)
form = LinkOrganisationsForm(
choices=convert_dictionary_to_wtforms_choices_format(organisations, 'id', 'name'),
organisations=current_organisation
choices=convert_dictionary_to_wtforms_choices_format(all_organisations, 'id', 'name'),
organisations=current_linked_organisation
)
if form.validate_on_submit():
if form.organisations.data != current_organisation:
if form.organisations.data != current_linked_organisation:
organisations_client.update_service_organisation(
service_id,
form.organisations.data
@@ -1036,7 +1036,7 @@ def link_service_to_organisation(service_id):
return render_template(
'views/service-settings/link-service-to-organisation.html',
has_organisations=organisations,
has_organisations=all_organisations,
form=form,
)