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

Merge pull request #3043 from alphagov/add-first-letter-contact-experience

Browse Source 
Make adding a ‘letter contact block’ for the first time make sense
This commit is contained in:
Chris Hill-Scott
2019-07-12 15:14:18 +01:00
committed by GitHub
parent 8307e31cb4 b6932912ce
commit 886992af17
8 changed files with 82 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -706,21 +706,32 @@ def service_letter_contact_details(service_id):
def service_add_letter_contact(service_id):
form = ServiceLetterContactBlockForm()
first_contact_block = current_service.count_letter_contact_details == 0
from_template = request.args.get('from_template')
if form.validate_on_submit():
service_api_client.add_letter_contact(
new_letter_contact = service_api_client.add_letter_contact(
current_service.id,
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
)
if request.args.get('from_template'):
if from_template:
service_api_client.update_service_template_sender(
service_id,
from_template,
new_letter_contact['data']['id'],
)
return redirect(
url_for('.set_template_sender', service_id=service_id, template_id=request.args.get('from_template'))
url_for('.view_template', service_id=service_id, template_id=from_template)
)
return redirect(url_for('.service_letter_contact_details', service_id=service_id))
return render_template(
'views/service-settings/letter-contact/add.html',
form=form,
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)
),
)

9
app/main/views/templates.py
View File

@@ -57,13 +57,7 @@ def view_template(service_id, template_id):
return redirect(url_for(
'.send_one_off', service_id=service_id, template_id=template_id
))
if template["template_type"] == "letter":
letter_contact_details = service_api_client.get_letter_contacts(service_id)
default_letter_contact_block_id = next(
(x['id'] for x in letter_contact_details if x['is_default']), None
)
else:
default_letter_contact_block_id = None
return render_template(
'views/templates/template.html',
template=get_template(
@@ -81,7 +75,6 @@ def view_template(service_id, template_id):
),
template_postage=template["postage"],
user_has_template_permission=user_has_template_permission,
default_letter_contact_block_id=default_letter_contact_block_id,
)