Aggiunto default per quando un utente non ha un tema attivo assegnato o se è un non utente. In questo modo non usa un tema a caso ma quello settato come default

testato-con-bdlaser
Davide Borgonovo 2023-01-30 15:08:33 +01:00
parent c44621dae1
commit d85690fb9c
5 changed files with 48 additions and 5 deletions

View File

@ -22,6 +22,7 @@ class ThemeAdmin(ImportMixin, admin.ModelAdmin):
"name", "name",
"active", "active",
"demo", "demo",
"default",
) )
list_editable = ("active",) list_editable = ("active",)
list_per_page = 100 list_per_page = 100
@ -36,6 +37,7 @@ class ThemeAdmin(ImportMixin, admin.ModelAdmin):
"name", "name",
"active", "active",
"demo", "demo",
"default",
), ),
}, },
), ),

View File

@ -18,6 +18,7 @@ def get_active_theme(request):
obj = objs_active_ls[0] obj = objs_active_ls[0]
elif objs_active_count > 1: elif objs_active_count > 1:
# for frame_record in inspect.stack(): # for frame_record in inspect.stack():
# if frame_record[3]=='get_response': # if frame_record[3]=='get_response':
# request = frame_record[0].f_locals['request'] # request = frame_record[0].f_locals['request']
@ -29,8 +30,13 @@ def get_active_theme(request):
try: try:
obj = user_theme_manager.filter(user=user, theme__active=True).first().theme obj = user_theme_manager.filter(user=user, theme__active=True).first().theme
except: except:
obj = objs_active_ls[-1] objs_default_qs = objs_active_qs.filter(default=True)
obj.set_active() if len(objs_default_qs) == 0:
obj = objs_active_qs.first()
if obj:
obj.set_default()
else:
obj = objs_default_qs.first()
return { return {
'theme': obj, 'theme': obj,

View File

@ -0,0 +1,18 @@
# Generated by Django 4.0.3 on 2023-01-30 14:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0029_auto_20221025_1559'),
]
operations = [
migrations.AddField(
model_name='theme',
name='default',
field=models.BooleanField(default=False, verbose_name='default'),
),
]

View File

@ -84,8 +84,13 @@ class Theme(models.Model):
try: try:
return user_theme_manager.filter(user=user, theme__active=True).first().theme return user_theme_manager.filter(user=user, theme__active=True).first().theme
except: except:
obj = objs_active_ls[-1] objs_default_qs = objs_active_qs.filter(default=True)
obj.set_active() if len(objs_default_qs) == 0:
obj = objs_active_qs.first()
if obj:
obj.set_default()
else:
obj = objs_default_qs.first()
return obj return obj
@ -95,6 +100,9 @@ class Theme(models.Model):
active = models.BooleanField(default=True, verbose_name=_("active")) active = models.BooleanField(default=True, verbose_name=_("active"))
demo = models.BooleanField(default=False, verbose_name=_("is demo")) demo = models.BooleanField(default=False, verbose_name=_("is demo"))
default = models.BooleanField(default=False, verbose_name="default")
users = models.ManyToManyField('auth.User', through=UserTheme) users = models.ManyToManyField('auth.User', through=UserTheme)
title = models.CharField( title = models.CharField(
@ -409,6 +417,15 @@ class Theme(models.Model):
self.active = True self.active = True
self.save() self.save()
def set_default(self):
self.default = True
self.save()
def save(self):
if self.default:
Theme.objects.update(default=False)
super().save()
class Meta: class Meta:
app_label = "admin_interface" app_label = "admin_interface"

View File

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__version__ = "0.19.5" __version__ = "0.19.6"