From 5ecc003de06898c57fa82fa9228cdbb840423cbd Mon Sep 17 00:00:00 2001
From: fengxuan <fengxuan@situdata.com>
Date: Thu, 6 Jul 2023 14:56:34 +0800
Subject: [PATCH] MOD:用户权限移动到acc模块下
---
src/apps/account/admin.py | 6 ++++++
src/apps/doc/admin.py | 8 +++++++-
src/apps/doc/models.py | 5 +++--
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/apps/account/admin.py b/src/apps/account/admin.py
index 1454984..59f655b 100644
--- a/src/apps/account/admin.py
+++ b/src/apps/account/admin.py
@@ -18,6 +18,7 @@ from django.utils.translation import gettext, gettext_lazy as _
from django.views.decorators.csrf import csrf_protect
from django.views.decorators.debug import sensitive_post_parameters
from apps.myadmin.admin import admin_site
+from apps.doc.models import UserRole
csrf_protect_m = method_decorator(csrf_protect)
sensitive_post_parameters_m = method_decorator(sensitive_post_parameters())
@@ -203,6 +204,11 @@ class UserAdmin(admin.ModelAdmin):
request.POST['_continue'] = 1
return super().response_add(request, obj, post_url_continue)
+# Register your models here.
+class UserRoleAdmin(admin.ModelAdmin):
+ list_display = ('id', 'auth_user_id', 'role')
+
admin_site.register(Group, GroupAdmin)
admin_site.register(User, UserAdmin)
+admin_site.register(UserRole, UserRoleAdmin)
diff --git a/src/apps/doc/admin.py b/src/apps/doc/admin.py
index fbc3d9e..79b3774 100644
--- a/src/apps/doc/admin.py
+++ b/src/apps/doc/admin.py
@@ -1,5 +1,5 @@
from django.contrib import admin
-from .models import Keywords, Configs
+from .models import Keywords, Configs, UserRole
from .named_enum import KeywordsType
from apps.myadmin.admin import admin_site
@@ -20,7 +20,13 @@ class ConfigsAdmin(admin.ModelAdmin):
list_display = ('id', 'value', 'comment')
+# Register your models here.
+class UserRoleAdmin(admin.ModelAdmin):
+ list_display = ('id', 'auth_user_id', 'role')
+
+
admin_site.register(Keywords, KeywordsAdmin)
admin_site.register(Configs, ConfigsAdmin)
+admin_site.register(UserRole, UserRoleAdmin)
# admin.site.site_header = '宝马OCR'
# admin.site.site_title = '宝马OCR'
diff --git a/src/apps/doc/models.py b/src/apps/doc/models.py
index 74d5c4a..dd6cab0 100644
--- a/src/apps/doc/models.py
+++ b/src/apps/doc/models.py
@@ -1103,8 +1103,9 @@ class UserRole(models.Model):
id = models.AutoField(primary_key=True, verbose_name="id") # 主键
auth_user_id = models.SmallIntegerField(null=False, default=0, verbose_name="auth_user_id")
role = models.SmallIntegerField(null=False, default=0, verbose_name="role")
- menu_list = models.CharField(max_length=64, verbose_name="menu_list")
+ menu_list = models.CharField(max_length=64, verbose_name="menu_list", blank=True)
class Meta:
managed = False
- db_table = 'user_role'
\ No newline at end of file
+ db_table = 'user_role'
+ verbose_name = '用户权限管理'
\ No newline at end of file
--
libgit2 0.24.0