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

Merge branch 'master' into error-handling

Browse Source 
Conflicts:
	app/main/views/invites.py
This commit is contained in:
Rebecca Law
2016-03-10 15:03:21 +00:00
parent 735ca07dee 8c250a7853
commit 4ba801edab
16 changed files with 219 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,28 +100,6 @@ def edit_user_permissions(service_id, user_id):
)
@main.route("/services/<service_id>/users/<user_id>/delete", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
def delete_user(service_id, user_id):
user = user_api_client.get_user(user_id)
service = get_service_by_id(service_id)
if request.method == 'POST':
return redirect(url_for('.manage_users', service_id=service_id))
flash(
'Are you sure you want to delete {}’s account?'.format(user.get('name') or user['email_localpart']),
'delete'
)
return render_template(
'views/invite-user.html',
user=user,
service_id=service_id
)
@main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
def cancel_invited_user(service_id, invited_user_id):