From 676a9a5d2c71856d00a6f3313db28e617b63f311 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sun, 2 Oct 2016 10:14:53 +0200 Subject: [PATCH] Do not redirect users to admin pages, fix #74 --- admin/freeposte/admin/views/users.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/freeposte/admin/views/users.py b/admin/freeposte/admin/views/users.py index 524d0804..fcc56939 100644 --- a/admin/freeposte/admin/views/users.py +++ b/admin/freeposte/admin/views/users.py @@ -71,8 +71,8 @@ def user_delete(user_email): @app.route('/user/usersettings/', methods=['GET', 'POST']) @access.owner(models.User, 'user_email') def user_settings(user_email): - user_email = user_email or flask_login.current_user.email - user = models.User.query.get(user_email) or flask.abort(404) + user_email_or_current = user_email or flask_login.current_user.email + user = models.User.query.get(user_email_or_current) or flask.abort(404) form = forms.UserSettingsForm(obj=user) if form.validate_on_submit(): form.populate_obj(user) @@ -88,8 +88,8 @@ def user_settings(user_email): @app.route('/user/password/', methods=['GET', 'POST']) @access.owner(models.User, 'user_email') def user_password(user_email): - user_email = user_email or flask_login.current_user.email - user = models.User.query.get(user_email) or flask.abort(404) + user_email_or_current = user_email or flask_login.current_user.email + user = models.User.query.get(user_email_or_current) or flask.abort(404) form = forms.UserPasswordForm() if form.validate_on_submit(): if form.pw.data != form.pw2.data: @@ -108,8 +108,8 @@ def user_password(user_email): @app.route('/user/forward/', methods=['GET', 'POST']) @access.owner(models.User, 'user_email') def user_forward(user_email): - user_email = user_email or flask_login.current_user.email - user = models.User.query.get(user_email) or flask.abort(404) + user_email_or_current = user_email or flask_login.current_user.email + user = models.User.query.get(user_email_or_current) or flask.abort(404) form = forms.UserForwardForm(obj=user) if form.validate_on_submit(): form.populate_obj(user) @@ -125,8 +125,8 @@ def user_forward(user_email): @app.route('/user/reply/', methods=['GET', 'POST']) @access.owner(models.User, 'user_email') def user_reply(user_email): - user_email = user_email or flask_login.current_user.email - user = models.User.query.get(user_email) or flask.abort(404) + user_email_or_current = user_email or flask_login.current_user.email + user = models.User.query.get(user_email_or_current) or flask.abort(404) form = forms.UserReplyForm(obj=user) if form.validate_on_submit(): form.populate_obj(user)