功能变化: 添加"请先进行数据库迁移"提示
parent
8f0c811569
commit
dbee7dd060
|
@ -3,7 +3,7 @@ import os
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.models import AbstractUser
|
from django.contrib.auth.models import AbstractUser
|
||||||
from django.db import models
|
from django.db import models, ProgrammingError
|
||||||
|
|
||||||
from dvadmin.utils.models import CoreModel, table_prefix
|
from dvadmin.utils.models import CoreModel, table_prefix
|
||||||
|
|
||||||
|
@ -197,17 +197,20 @@ class Dictionary(CoreModel):
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def init_dictionary(cls):
|
def init_dictionary(cls):
|
||||||
queryset = cls.objects.filter(status=True, is_value=False)
|
try:
|
||||||
data = []
|
queryset = cls.objects.filter(status=True, is_value=False)
|
||||||
for instance in queryset:
|
data = []
|
||||||
data.append({
|
for instance in queryset:
|
||||||
"id": instance.id,
|
data.append({
|
||||||
"value": instance.value,
|
"id": instance.id,
|
||||||
"children": list(cls.objects.filter(parent=instance.id).filter(status=1).
|
"value": instance.value,
|
||||||
values('label', 'value', 'type', 'color'))
|
"children": list(cls.objects.filter(parent=instance.id).filter(status=1).
|
||||||
})
|
values('label', 'value', 'type', 'color'))
|
||||||
settings.DICTIONARY_CONFIG = {ele.get("value"): ele for ele in data}
|
})
|
||||||
print("初始化字典配置完成")
|
settings.DICTIONARY_CONFIG = {ele.get("value"): ele for ele in data}
|
||||||
|
print("初始化字典配置完成")
|
||||||
|
except ProgrammingError as e:
|
||||||
|
print("请先进行数据库迁移!")
|
||||||
return
|
return
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -395,13 +398,16 @@ class SystemConfig(CoreModel):
|
||||||
:param name:
|
:param name:
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
data = {}
|
try:
|
||||||
system_config_obj = SystemConfig.objects.filter(status=True, parent_id__isnull=False).values(
|
data = {}
|
||||||
'parent__key', 'key', 'value', 'form_item_type').order_by('sort')
|
system_config_obj = SystemConfig.objects.filter(status=True, parent_id__isnull=False).values(
|
||||||
for system_config in system_config_obj:
|
'parent__key', 'key', 'value', 'form_item_type').order_by('sort')
|
||||||
data[f"{system_config.get('parent__key')}.{system_config.get('key')}"] = system_config.get('value') or ''
|
for system_config in system_config_obj:
|
||||||
settings.SYSTEM_CONFIG = data
|
data[f"{system_config.get('parent__key')}.{system_config.get('key')}"] = system_config.get('value') or ''
|
||||||
print("初始化系统配置完成")
|
settings.SYSTEM_CONFIG = data
|
||||||
|
print("初始化系统配置完成")
|
||||||
|
except ProgrammingError as e:
|
||||||
|
print("请先进行数据库迁移!")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue