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

Refactor back link into view layer

Browse Source
This commit is contained in:
Chris Hill-Scott
2019-07-08 11:31:55 +01:00
parent 76dd222726
commit b6932912ce
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -705,13 +705,13 @@ def service_letter_contact_details(service_id):
def service_add_letter_contact(service_id): def service_add_letter_contact(service_id):
form = ServiceLetterContactBlockForm() form = ServiceLetterContactBlockForm()
first_contact_block = current_service.count_letter_contact_details == 0 first_contact_block = current_service.count_letter_contact_details == 0
from_template = request.args.get('from_template')
if form.validate_on_submit(): if form.validate_on_submit():
new_letter_contact = service_api_client.add_letter_contact( new_letter_contact = service_api_client.add_letter_contact(
current_service.id, current_service.id,
contact_block=form.letter_contact_block.data.replace('\r', '') or None, contact_block=form.letter_contact_block.data.replace('\r', '') or None,
is_default=first_contact_block if first_contact_block else form.is_default.data is_default=first_contact_block if first_contact_block else form.is_default.data
) )
from_template = request.args.get('from_template')
if from_template: if from_template:
service_api_client.update_service_template_sender( service_api_client.update_service_template_sender(
service_id, service_id,
@@ -726,6 +726,11 @@ def service_add_letter_contact(service_id):
'views/service-settings/letter-contact/add.html', 'views/service-settings/letter-contact/add.html',
form=form, form=form,
first_contact_block=first_contact_block, first_contact_block=first_contact_block,
back_link=(
url_for('main.view_template', template_id=from_template, service_id=current_service.id)
if from_template
else url_for('.service_letter_contact_details', service_id=current_service.id)
),
) )

2
app/templates/views/service-settings/letter-contact/add.html
View File

@@ -13,7 +13,7 @@
{{ page_header( {{ page_header(
'Add a new address', 'Add a new address',
back_link=url_for('main.view_template', template_id=request.args.get('from_template'), service_id=current_service.id) if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id) back_link=back_link
) }} ) }}
<div class="grid-row"> <div class="grid-row">
<div class="column-whole"> <div class="column-whole">