From 1b0d20f4944e0b4f9c0523d7b6a2635380fc6343 Mon Sep 17 00:00:00 2001 From: "davide.borgonovo" Date: Tue, 27 Dec 2022 10:43:38 +0100 Subject: [PATCH] Corretto il get_active_theme nel context_processor e nel modello --- admin_interface/context_processor.py | 5 +++-- admin_interface/models.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin_interface/context_processor.py b/admin_interface/context_processor.py index cf832cb..8dea348 100644 --- a/admin_interface/context_processor.py +++ b/admin_interface/context_processor.py @@ -1,7 +1,8 @@ -from .models import Theme +from .models import Theme, UserTheme def get_active_theme(request): objs_manager = Theme.objects + user_theme_manager = UserTheme.objects objs_active_qs = objs_manager.filter(active=True) objs_active_ls = list(objs_active_qs) objs_active_count = len(objs_active_ls) @@ -26,7 +27,7 @@ def get_active_theme(request): # request = None user = request.user try: - obj = objs_active_qs.filter(user=user).first() + obj = user_theme_manager.filter(user=user, theme__active=True).first().theme except: obj = objs_active_ls[-1] obj.set_active() diff --git a/admin_interface/models.py b/admin_interface/models.py index 51cc3e8..1e54fa9 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -57,6 +57,7 @@ class Theme(models.Model): @staticmethod def get_active_theme(): objs_manager = Theme.objects + user_theme_manager = UserTheme.objects objs_active_qs = objs_manager.filter(active=True) objs_active_ls = list(objs_active_qs) objs_active_count = len(objs_active_ls) @@ -81,8 +82,8 @@ class Theme(models.Model): request = None try: - return objs_active_qs.filter(user=user).first() - except: + return user_theme_manager.filter(user=user, theme__active=True).first().theme + except AttributeError as e: obj = objs_active_ls[-1] obj.set_active()