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

Merge pull request #4151 from alphagov/brand-new-branding-tidy-ups

Browse Source 
Tidy up new email branding routes
This commit is contained in:
Katie Smith
2022-02-08 08:53:00 +00:00
committed by GitHub
parent d660db84b9 a7a593fd8b
commit d8b421a9d6
4 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1153,7 +1153,6 @@ def create_email_branding_zendesk_ticket(form_option_selected, detail=None):
zendesk_client.send_ticket_to_zendesk(ticket)
@main.route("/services/<uuid:service_id>/branding-request/email", methods=['GET', 'POST'])
@main.route("/services/<uuid:service_id>/service-settings/email-branding", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
def email_branding_request(service_id):
@@ -1169,19 +1168,10 @@ def email_branding_request(service_id):
flash('Thanks for your branding request. We’ll get back to you within one working day.', 'default')
return redirect(url_for('.service_settings', service_id=current_service.id))
else:
endpoint = {
'govuk': '.email_branding_govuk',
'govuk_and_org': '.email_branding_govuk',
'nhs': '.email_branding_nhs',
'organisation': '.email_branding_organisation',
'something_else': '.email_branding_something_else',
}[form.options.data]
return redirect(
url_for(
endpoint,
f'.email_branding_{form.options.data}',
service_id=current_service.id,
with_org=(True if form.options.data == 'govuk_and_org' else None),
)
)
@@ -1203,9 +1193,7 @@ def check_branding_allowed_for_service(branding):
@main.route("/services/<uuid:service_id>/service-settings/email-branding/govuk", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
def email_branding_govuk(service_id):
with_org = request.args.get('with_org')
check_branding_allowed_for_service('govuk_and_org' if with_org else 'govuk')
check_branding_allowed_for_service('govuk')
if request.method == 'POST':
create_email_branding_zendesk_ticket(request.form['branding_choice'])
@@ -1213,7 +1201,21 @@ def email_branding_govuk(service_id):
flash('Thanks for your branding request. We’ll get back to you within one working day.', 'default')
return redirect(url_for('.service_settings', service_id=current_service.id))
return render_template('views/service-settings/branding/email-branding-govuk.html', with_org=with_org)
return render_template('views/service-settings/branding/email-branding-govuk.html')
@main.route("/services/<uuid:service_id>/service-settings/email-branding/govuk-and-org", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
def email_branding_govuk_and_org(service_id):
check_branding_allowed_for_service('govuk_and_org')
if request.method == 'POST':
create_email_branding_zendesk_ticket(request.form['branding_choice'])
flash('Thanks for your branding request. We’ll get back to you within one working day.', 'default')
return redirect(url_for('.service_settings', service_id=current_service.id))
return render_template('views/service-settings/branding/email-branding-govuk.html', with_org=True)
@main.route("/services/<uuid:service_id>/service-settings/email-branding/nhs", methods=['GET', 'POST'])
@@ -1260,7 +1262,6 @@ def email_branding_something_else(service_id):
return render_template('views/service-settings/branding/email-branding-something-else.html', form=form)
@main.route("/services/<uuid:service_id>/branding-request/letter", methods=['GET', 'POST'])
@main.route("/services/<uuid:service_id>/service-settings/letter-branding", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
def letter_branding_request(service_id):

2
app/templates/views/service-settings/branding/email-branding-govuk.html
View File

@@ -37,7 +37,7 @@
<p class="govuk-body">We’ll email you once your branding’s ready to use, or if we need any more information.</p>
{% call form_wrapper() %}
{{ page_footer('Request new branding', button_name='branding_choice', button_value=('govuk_and_org' if with_org == 'True' else 'govuk')) }}
{{ page_footer('Request new branding', button_name='branding_choice', button_value=('govuk_and_org' if with_org else 'govuk')) }}
{% endcall %}
{% endblock %}