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

Merge pull request #631 from alphagov/breaking-change

Browse Source 
Warn users when a template change is going to break things
This commit is contained in:
Chris Hill-Scott
2016-06-02 11:29:16 +01:00
parent 4237898e88 53ec44a2d2
commit 20d76c0625
8 changed files with 186 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
import json
import itertools
from string import ascii_uppercase
from contextlib import suppress
from zipfile import BadZipFile
from xlrd.biffh import XLRDError
@@ -127,8 +129,11 @@ def send_messages(service_id, template_id):
return render_template(
'views/send.html',
template=template,
recipient_column=first_column_heading[template.template_type],
example=[get_example_csv_rows(template)],
column_headings=list(ascii_uppercase[:len(template.placeholders) + 1]),
example=[
[first_column_heading[template.template_type]] + list(template.placeholders),
get_example_csv_rows(template)
],
form=form
)

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

@@ -1,12 +1,16 @@
from flask import request, render_template, redirect, url_for, flash, abort
from string import ascii_uppercase
from flask import request, render_template, redirect, url_for, flash, abort, session
from flask_login import login_required
from notifications_utils.template import Template
from notifications_utils.template import Template, TemplateChange
from notifications_utils.recipients import first_column_heading
from notifications_python_client.errors import HTTPError
from app.main import main
from app.utils import user_has_permissions
from app.main.forms import SMSTemplateForm, EmailTemplateForm
from app.main.views.send import get_example_csv_rows
from app import service_api_client, current_service
@@ -109,6 +113,28 @@ def edit_service_template(service_id, template_id):
form = form_objects[template['template_type']](**template)
if form.validate_on_submit():
subject = form.subject.data if hasattr(form, 'subject') else None
new_template = Template({
'name': form.name.data,
'content': form.template_content.data,
'subject': subject,
'template_type': template['template_type'],
'id': template['id']
})
template_change = Template(template).compare_to(new_template)
if template_change.has_different_placeholders and not request.form.get('confirm'):
return render_template(
'views/templates/breaking-change.html',
template_change=template_change,
new_template=new_template,
column_headings=list(ascii_uppercase[:len(new_template.placeholders) + 1]),
example_rows=[
[first_column_heading[new_template.template_type]] + list(new_template.placeholders),
get_example_csv_rows(new_template),
get_example_csv_rows(new_template)
],
form=form
)
try:
service_api_client.update_service_template(
template_id,
@@ -116,7 +142,7 @@ def edit_service_template(service_id, template_id):
template['template_type'],
form.template_content.data,
service_id,
form.subject.data if getattr(form, 'subject', None) else None
subject
)
except HTTPError as e:
if e.status_code == 400: