globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Authorization screen do not display menu

Browse source
This commit is contained in:
Éloi Rivard 2020-08-20 11:32:33 +02:00
parent de1d0a232d
commit 8d48e4bdd7
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
web/__init__.py
View file

@ -56,6 +56,7 @@ def setup_app(app):
"logo_url": app.config.get("LOGO"), "logo_url": app.config.get("LOGO"),
"website_name": app.config.get("NAME"), "website_name": app.config.get("NAME"),
"user": current_user(), "user": current_user(),
"menu": True,
} }
@babel.localeselector @babel.localeselector

2
web/flaskutils.py
View file

@ -29,7 +29,7 @@ def admin_needed():
user = current_user() user = current_user()
if not user: if not user:
abort(403) abort(403)
if not user.is_admin: if not user.admin:
abort(404) abort(404)
return view_function(*args, **kwargs) return view_function(*args, **kwargs)

8
web/oauth.py
View file

@ -19,11 +19,11 @@ def authorize():
if not user: if not user:
form = LoginForm(request.form or None) form = LoginForm(request.form or None)
if request.method == "GET": if request.method == "GET":
return render_template("login.html", form=form) return render_template("login.html", form=form, menu=False)
if not form.validate() or not User.login(form.login.data, form.password.data): if not form.validate() or not User.login(form.login.data, form.password.data):
flash(gettext("Login failed, please check your information"), "error") flash(gettext("Login failed, please check your information"), "error")
return render_template("login.html", form=form) return render_template("login.html", form=form, menu=False)
return redirect(request.url) return redirect(request.url)
@ -33,7 +33,9 @@ def authorize():
except OAuth2Error as error: except OAuth2Error as error:
return jsonify(dict(error.get_body())) return jsonify(dict(error.get_body()))
return render_template("authorize.html", user=user, grant=grant, client=client) return render_template(
"authorize.html", user=user, grant=grant, client=client, menu=False
)
if request.form["answer"] == "logout": if request.form["answer"] == "logout":
del session["user_dn"] del session["user_dn"]

2
web/templates/base.html
View file

@ -23,7 +23,7 @@
<body> <body>
<div class="container"> <div class="container">
{% block menu %} {% block menu %}
{% if user %} {% if user and menu %}
<nav class="ui labeled icon menu"> <nav class="ui labeled icon menu">
{% if logo_url %} {% if logo_url %}
<div class="header item"> <div class="header item">