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

Merge with master.

Browse Source
This commit is contained in:
Nicholas Staples
2016-03-01 15:53:58 +00:00
parent d3bc390b6c
commit efaf826e86
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,17 +29,26 @@ from app import job_api_client
from app.utils import ( from app.utils import (
validate_recipient, InvalidPhoneError, InvalidEmailError, user_has_permissions) validate_recipient, InvalidPhoneError, InvalidEmailError, user_has_permissions)
page_headings = {
'manage_service': { manage_service_page_headings = {
'email': 'Send emails', 'email': 'Send emails',
'sms': 'Send text messages'}, 'sms': 'Send text messages'
'manage_templates': {
'email': 'Manage templates',
'sms': 'Manage templates'
}
} }
manage_templates_page_headings = {
'email': 'Manage templates',
'sms': 'Manage templates'
}
def get_page_headings(template_type):
if current_user.has_permissions(session.get('service_id', ''), 'manage_service'):
return manage_service_page_headings[template_type]
else:
return manage_templates_page_headings[template_type]
@main.route("/services/<service_id>/send/letters", methods=['GET']) @main.route("/services/<service_id>/send/letters", methods=['GET'])
def letters_stub(service_id): def letters_stub(service_id):
return render_template( return render_template(
@@ -63,9 +72,6 @@ def choose_template(service_id, template_type):
abort(404) abort(404)
else: else:
raise e raise e
# TODO fix up how page_heading is loaded.
page_heading = page_headings['manage_service'][template_type] if current_user.has_permissions(session.get('service_id', ''), 'manage_service') else \
page_headings['manage_templates'][template_type]
return render_template( return render_template(
'views/choose-template.html', 'views/choose-template.html',
templates=[ templates=[
@@ -76,7 +82,7 @@ def choose_template(service_id, template_type):
if template['template_type'] == template_type if template['template_type'] == template_type
], ],
template_type=template_type, template_type=template_type,
page_heading=page_heading, page_heading=get_page_headings(template_type),
service=service, service=service,
has_jobs=len(jobs), has_jobs=len(jobs),
service_id=service_id service_id=service_id
@@ -188,7 +194,7 @@ def check_messages(service_id, upload_id):
'views/check.html', 'views/check.html',
upload_result=upload_result, upload_result=upload_result,
template=template, template=template,
page_heading=page_headings[template.template_type], page_heading=get_page_headings(template.template_type),
column_headers=['to'] + list(template.placeholders_as_markup), column_headers=['to'] + list(template.placeholders_as_markup),
original_file_name=upload_data.get('original_file_name'), original_file_name=upload_data.get('original_file_name'),
service_id=service_id, service_id=service_id,