From 71ed2cc756a6d5d3716a7243c4dd2efaea005c61 Mon Sep 17 00:00:00 2001 From: Aidaho Date: Sat, 14 Sep 2024 11:58:47 +0300 Subject: [PATCH] v8.0.1: Set user_group_id from Flask global object Added logic to set user_group_id based on Flask global object `g`, with a fallback to default value if an exception occurs. This enhances the flexibility of `user_group_id` assignment based on runtime context. --- app/modules/db/sql.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/modules/db/sql.py b/app/modules/db/sql.py index ea3a40c6..326becea 100755 --- a/app/modules/db/sql.py +++ b/app/modules/db/sql.py @@ -1,3 +1,5 @@ +from flask import g + from app.modules.db.db_model import GeoipCodes, Setting, Role from app.modules.db.common import out_error @@ -6,7 +8,10 @@ def get_setting(param, **kwargs): if kwargs.get('group_id'): user_group_id = kwargs.get('group_id') else: - user_group_id = 1 + try: + user_group_id = g.user_params['group_id'] + except Exception: + user_group_id = 1 if kwargs.get('all') and not kwargs.get('section'): query = Setting.select().where(Setting.group == user_group_id).order_by(Setting.section.desc())