From bf1a6f383ebda785311b9b5e5aa49cf2c2f8d7e2 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Sat, 10 Jul 2021 23:30:47 +0200 Subject: [PATCH] Little fix in app --- paramecio2/modules/admin/app.py | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/paramecio2/modules/admin/app.py b/paramecio2/modules/admin/app.py index 009b8f5..dcc6bf6 100644 --- a/paramecio2/modules/admin/app.py +++ b/paramecio2/modules/admin/app.py @@ -30,8 +30,6 @@ def admin_prepare(): g.connection=WebModel.connection() - g.login=False - if request.endpoint!='admin_app.login' and request.endpoint!='admin_app.signup': if 'login_admin' not in session: @@ -42,21 +40,18 @@ def admin_prepare(): arr_count=cursor.fetchone() - if arr_count['count_id']!=0: + if arr_count['count_id']==0: - #return redirect(url_for('admin_app.login')) - pass + url_redirect=config.domain_url+url_for('admin_app.login', _external=False) + + return redirect(url_redirect) - """ - #else: - - #url_redirect=url_for('admin_app.login', _external=False) - #return redirect(url_redirect) - """ + else: - else: - g.login=True + url_redirect=config.domain_url+url_for('admin_app.login', _external=False) + + return redirect(url_redirect) @admin_app.after_request def admin_finished(response): @@ -99,13 +94,8 @@ for app_load in config_admin: @admin_app.route('/admin/') def admin(): - - if g.login: - - return t.load_template('home.phtml', title=I18n.lang('admin', 'paramecio_admin', 'Paramecio admin')) - else: - - return redirect(url_for('admin_app.login')) + return t.load_template('home.phtml', title=I18n.lang('admin', 'paramecio_admin', 'Paramecio admin')) + """ @admin_app.route('/admin/') @admin_app.route('/admin/', methods=['GET', 'POST'])