Update all dates to use utc, only in the template is it converted to british time.

Template versions and template version pages added.

Fix merge changes.
This commit is contained in:
Nicholas Staples
2016-05-11 11:20:45 +01:00
committed by Chris Hill-Scott
parent daf33b03ad
commit 64e7a7b010
12 changed files with 283 additions and 13 deletions

View File

@@ -21,7 +21,7 @@ page_headings = {
}
@main.route("/services/<service_id>/templates/<template_id>", methods=['GET'])
@main.route("/services/<service_id>/templates/<template_id>")
@login_required
@user_has_permissions(
'view_activity',
@@ -41,6 +41,27 @@ def view_template(service_id, template_id):
)
@main.route("/services/<service_id>/templates/<template_id>/version/<int:version>")
@login_required
@user_has_permissions(
'view_activity',
'send_texts',
'send_emails',
'manage_templates',
'manage_api_keys',
admin_override=True,
any_=True
)
def view_template_version(service_id, template_id, version):
return render_template(
'views/templates/template_history.html',
template=Template(
service_api_client.get_service_template(service_id, template_id, version)['data'],
prefix=current_service['name']
)
)
@main.route("/services/<service_id>/templates/add-<template_type>", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_templates', admin_override=True)
@@ -142,3 +163,30 @@ def delete_service_template(service_id, template_id):
h1='Edit template',
form=form,
template_id=template_id)
@main.route('/services/<service_id>/templates/<template_id>/versions')
@login_required
@user_has_permissions(
'view_activity',
'send_texts',
'send_emails',
'manage_templates',
'manage_api_keys',
admin_override=True,
any_=True
)
def view_template_versions(service_id, template_id):
return render_template(
'views/templates/choose_history.html',
template=Template(
service_api_client.get_service_template(service_id, template_id)['data'],
prefix=current_service['name']
),
versions=[
Template(
template,
prefix=current_service['name']
) for template in service_api_client.get_service_template_versions(service_id, template_id)['data']
]
)