Added current_service to flask context and template context.

Fix all tests and conflicts.

Removed comment line.
This commit is contained in:
Nicholas Staples
2016-04-04 17:01:20 +01:00
parent f444284580
commit c31c55666b
37 changed files with 207 additions and 202 deletions
@@ -18,7 +18,7 @@
{{ page_footer(
'Confirm',
destructive=destructive,
back_link=url_for('.service_settings', service_id=service_id)
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
</form>
</div>
@@ -35,9 +35,9 @@
<form method="post">
{{ page_footer(
'Yes, delete {}'.format(service.name),
'Yes, delete {}'.format(current_service.name),
destructive=True,
back_link=url_for('.service_settings', service_id=service_id)
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
</form>
@@ -24,7 +24,7 @@
{{ textbox(form.name) }}
{{ page_footer(
'Save',
back_link=url_for('.service_settings', service_id=service_id),
back_link=url_for('.service_settings', service_id=current_service.id),
back_link_text='Back to settings'
) }}
</form>
@@ -25,7 +25,7 @@
{{ page_footer(
'Suspend API keys',
destructive=True,
back_link=url_for('.service_settings', service_id=service_id),
back_link=url_for('.service_settings', service_id=current_service.id),
back_link_text='Back to settings'
) }}
</form>