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

Merge pull request #442 from alphagov/fix_link_bug

Browse Source 
Fix template delete links.
This commit is contained in:
NIcholas Staples
2016-04-13 17:01:11 +01:00
parent f76375875a 33cc90488c
commit 7272791c54
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/__init__.py
View File

@@ -213,14 +213,14 @@ def load_user(user_id):
def load_service_before_request(): def load_service_before_request():
service_id = request.view_args.get('service_id', None) if request.view_args else None service_id = request.view_args.get('service_id', session.get('service_id')) if request.view_args \
if service_id: else session.get('service_id')
from flask.globals import _request_ctx_stack from flask.globals import _request_ctx_stack
if _request_ctx_stack.top is not None: if _request_ctx_stack.top is not None:
setattr( setattr(
_request_ctx_stack.top, _request_ctx_stack.top,
'service', 'service',
service_api_client.get_service(service_id)['data']) service_api_client.get_service(service_id)['data'] if service_id else None)
def save_service_after_request(response): def save_service_after_request(response):

2
app/templates/views/api-keys/revoke.html
View File

@@ -28,7 +28,7 @@
<form method="post"> <form method="post">
{{ page_footer( {{ page_footer(
'Revoke this API key', 'Revoke this API key',
back_link=url_for('.api_keys', service_id=service_id), back_link=url_for('.api_keys', service_id=current_service.id),
back_link_text='Back to API keys', back_link_text='Back to API keys',
destructive=True destructive=True
) }} ) }}

2
app/templates/views/edit-email-template.html
View File

@@ -22,7 +22,7 @@
{{ textbox(form.template_content, highlight_tags=True, width='1-1') }} {{ textbox(form.template_content, highlight_tags=True, width='1-1') }}
{{ page_footer( {{ page_footer(
'Save', 'Save',
delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None, delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template_id) if template_id or None,
delete_link_text='Delete this template' delete_link_text='Delete this template'
) }} ) }}
</div> </div>

2
app/templates/views/edit-sms-template.html
View File

@@ -21,7 +21,7 @@
{{ textbox(form.template_content, highlight_tags=True, width='1-1') }} {{ textbox(form.template_content, highlight_tags=True, width='1-1') }}
{{ page_footer( {{ page_footer(
'Save', 'Save',
delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None, delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template_id) if template_id or None,
delete_link_text='Delete this template' delete_link_text='Delete this template'
) }} ) }}
</div> </div>