darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cancel-invited-user

Browse Source 
Conflicts:
	app/notify_client/invite_api_client.py
	tests/app/main/views/test_manage_users.py
This commit is contained in:
Rebecca Law
2016-03-01 18:01:20 +00:00
parent 73e5fe2907 ce5bf4e3ab
commit bfea4a42bc
11 changed files with 226 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/templates/views/manage-users.html
View File

@@ -40,9 +40,9 @@ Manage users – GOV.UK Notify
{% call field() %}
{{ item.email_address }}
{% endcall %}
{{ boolean_field(item.has_permissions(service_id, 'send_messages')) }}
{{ boolean_field(item.has_permissions(service_id, 'manage_service')) }}
{{ boolean_field(item.has_permissions(service_id, 'api_keys')) }}
{{ boolean_field(item.has_permissions('send_messages')) }}
{{ boolean_field(item.has_permissions('manage_service')) }}
{{ boolean_field(item.has_permissions('manage_api_keys')) }}
{% call field(align='right') %}
<a href="{{ url_for('.cancel_invited_user', service_id=service_id, invited_user_id=item.id)}}">Cancel invitation</a>
{% endcall %}