self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-01-28 03:56:43 +02:00
Code Issues Releases Activity

Fix the manager deletion behaviour

Browse Source
This commit is contained in:
Pierre Jaury 2016-08-29 19:40:18 +02:00
parent f541a951de
commit f8dcef22ef
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/freeposte/admin/templates/manager/list.html
View File

@ -22,7 +22,7 @@ Manager list
{% for manager in domain.managers %}
<tr>
<td>
<a href="{{ url_for('.manager_delete', manager=manager.email) }}" title="Delete"><i class="fa fa-trash"></i></a>
<a href="{{ url_for('.manager_delete', domain_name=domain.name, user_email=manager.email) }}" title="Delete"><i class="fa fa-trash"></i></a>
</td>
<td>{{ manager }}</td>
</tr>

21
admin/freeposte/admin/views/managers.py
View File

@ -37,18 +37,17 @@ def manager_create(domain_name):
domain=domain, form=form)
# TODO For now the deletion behaviour is broken and reserved to
# global admins.
@app.route('/manager/delete/<manager>', methods=['GET', 'POST'])
@access.confirmation_required("remove manager {manager}")
@access.global_admin
def manager_delete(manager):
user = models.User.query.get(manager)
if user in user.domain.managers:
user.domain.managers.remove(user)
@app.route('/manager/delete/<domain_name>/<user_email>', methods=['GET', 'POST'])
@access.confirmation_required("remove manager {user_email}")
@access.domain_admin(models.Domain, 'domain_name')
def manager_delete(domain_name, user_email):
domain = models.Domain.query.get(domain_name) or flask.abort(404)
user = models.User.query.get(user_email) or flask.abort(404)
if user in domain.managers:
domain.managers.remove(user)
db.session.commit()
flask.flash('User %s can no longer manager %s' % (user, user.domain))
flask.flash('User %s can no longer manager %s' % (user, domain))
else:
flask.flash('User %s is not manager' % user, 'error')
return flask.redirect(
flask.url_for('.manager_list', domain_name=user.domain.name))
flask.url_for('.manager_list', domain_name=domain_name))