From ab57b224e1a2355b0875be2bbb7057e9a7aefad3 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Tue, 1 Oct 2024 01:24:06 +0200 Subject: [PATCH] Fxes --- paramecio/citoplasma/adminutils.py | 3 ++- paramecio/modules/admin/index.py | 27 +++++++++++++++++-------- paramecio/modules/admin/models/admin.py | 2 ++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/paramecio/citoplasma/adminutils.py b/paramecio/citoplasma/adminutils.py index 323e1d0..cc2d0ae 100644 --- a/paramecio/citoplasma/adminutils.py +++ b/paramecio/citoplasma/adminutils.py @@ -161,7 +161,7 @@ def login_model(ModelLogin, session='', enable_tries=False): user_admin.conditions=['WHERE username=%s', [username]] - arr_user=user_admin.select_a_row_where(['id', 'username', 'password', 'privileges', 'lang', 'num_tries', 'email']) + arr_user=user_admin.select_a_row_where(['id', 'username', 'password', 'privileges', 'lang', 'num_tries', 'email', 'theme']) if arr_user==False: @@ -183,6 +183,7 @@ def login_model(ModelLogin, session='', enable_tries=False): s[session+'lang']=arr_user['lang'] s[session+'email']=arr_user['email'] s[session+'username']=arr_user['username'] + s[session+'theme']=str(arr_user['theme']) if s['lang']=='': s['lang']=I18n.default_lang diff --git a/paramecio/modules/admin/index.py b/paramecio/modules/admin/index.py index b869d65..a462c6b 100644 --- a/paramecio/modules/admin/index.py +++ b/paramecio/modules/admin/index.py @@ -199,7 +199,7 @@ def home(module='', submodule='', t=t): user_admin.conditions=['WHERE token_login=%s', [token_login]] - arr_user=user_admin.select_a_row_where(['id', 'privileges']) + arr_user=user_admin.select_a_row_where(['id', 'privileges', 'theme']) if arr_user==False: # delete cookioe @@ -211,6 +211,7 @@ def home(module='', submodule='', t=t): s['id']=arr_user['id'] s['login']=1 s['privileges']=arr_user['privileges'] + s['theme']=str(arr_user['theme']) s.save() @@ -480,15 +481,25 @@ def check_code_token(): @admin_app.get('/change_theme') def change_theme(): - theme_selected=str(request.query.get('theme', '0')) + error=1 - s=get_session() + if check_login(): + + theme_selected=str(request.query.get('theme', '0')) + + s=get_session() + + s['id']=s.get('id', 0) - s['theme']=theme_selected - - s.save() - - error=0 + connection=WebModel.connection() + + s['theme']=theme_selected + + s.save() + + connection.query('update useradmin set theme=%s WHERE id=%s', [s['theme'], s['id']]) + + error=0 return {'error': error} diff --git a/paramecio/modules/admin/models/admin.py b/paramecio/modules/admin/models/admin.py index 3c27276..bcd7e1b 100644 --- a/paramecio/modules/admin/models/admin.py +++ b/paramecio/modules/admin/models/admin.py @@ -89,6 +89,8 @@ class UserAdmin(UserModel): self.register(corefields.IntegerField('num_tries', 1)) + self.register(corefields.IntegerField('theme')) + """ user_admin=WebModel('user_admin')