darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 00:07:02 -04: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

4
app/main/views/manage_users.py
View File

@@ -57,8 +57,8 @@ def invite_user(service_id):
email_address = form.email_address.data
permissions = _get_permissions(request.form)
try:
resp = invite_api_client.create_invite(current_user.id, service_id, email_address, permissions)
flash('Invite sent to {}'.format(resp['email_address']), 'default_with_tick')
invited_user = invite_api_client.create_invite(current_user.id, service_id, email_address, permissions)
flash('Invite sent to {}'.format(invited_user.email_address), 'default_with_tick')
return redirect(url_for('.manage_users', service_id=service_id))
except HTTPError as e: