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

Merge pull request #253 from alphagov/delete-user-bug-fix

Browse Source 
Removed links for deleting users. Also removed view function
This commit is contained in:
Adam Shimali
2016-03-09 16:04:09 +00:00
parent 2acc496734 9523e224bc
commit eea5bfe749
3 changed files with 6 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,28 +103,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):

16
app/templates/views/edit-user-permissions.html
View File

@@ -26,17 +26,11 @@ Manage users – GOV.UK Notify
{{ yes_no(form.manage_api_keys.name, form.manage_api_keys.label, form.manage_api_keys.data) }}
</fieldset>
{% if user %}
{{ page_footer(
'Save',
delete_link=url_for('.delete_user', service_id=service_id, user_id=user_id),
delete_link_text='Delete this account',
back_link=url_for('.manage_users', service_id=service_id),
back_link_text='Cancel'
) }}
{% else %}
{{ page_footer('Send invitation email') }}
{% endif %}
{{ page_footer(
'Save',
back_link=url_for('.manage_users', service_id=service_id),
back_link_text='Cancel'
) }}
</form>
</div>

12
app/templates/views/invite-user.html
View File

@@ -28,17 +28,7 @@ Manage users – GOV.UK Notify
{{ yes_no(form.manage_api_keys.name, form.manage_api_keys.label, form.manage_api_keys.data) }}
</fieldset>
{% if user %}
{{ page_footer(
'Save',
delete_link=url_for('.delete_user', service_id=service_id, user_id=user_id),
delete_link_text='Delete this account',
back_link=url_for('.manage_users', service_id=service_id),
back_link_text='Cancel'
) }}
{% else %}
{{ page_footer('Send invitation email') }}
{% endif %}
{{ page_footer('Send invitation email') }}
</form>
</div>