c1a76eef by 冯轩

MOD:用户权限移动到acc模块下

1 parent 5ecc003d
...@@ -18,7 +18,7 @@ from django.utils.translation import gettext, gettext_lazy as _ ...@@ -18,7 +18,7 @@ from django.utils.translation import gettext, gettext_lazy as _
18 from django.views.decorators.csrf import csrf_protect 18 from django.views.decorators.csrf import csrf_protect
19 from django.views.decorators.debug import sensitive_post_parameters 19 from django.views.decorators.debug import sensitive_post_parameters
20 from apps.myadmin.admin import admin_site 20 from apps.myadmin.admin import admin_site
21 from apps.doc.models import UserRole 21 from apps.account.models import UserRole
22 22
23 csrf_protect_m = method_decorator(csrf_protect) 23 csrf_protect_m = method_decorator(csrf_protect)
24 sensitive_post_parameters_m = method_decorator(sensitive_post_parameters()) 24 sensitive_post_parameters_m = method_decorator(sensitive_post_parameters())
......
...@@ -3,3 +3,4 @@ from django.apps import AppConfig ...@@ -3,3 +3,4 @@ from django.apps import AppConfig
3 3
4 class AccountConfig(AppConfig): 4 class AccountConfig(AppConfig):
5 name = 'apps.account' 5 name = 'apps.account'
6 verbose_name = '权限'
......
1 from django.db import models 1 from django.db import models
2 2
3 # Create your models here. 3 # Create your models here.
4 class UserRole(models.Model):
5 id = models.AutoField(primary_key=True, verbose_name="id") # 主键
6 auth_user_id = models.SmallIntegerField(null=False, default=0, verbose_name="auth_user_id")
7 role = models.SmallIntegerField(null=False, default=0, verbose_name="role")
8 menu_list = models.CharField(max_length=64, verbose_name="menu_list", blank=True)
9
10 class Meta:
11 managed = False
12 db_table = 'user_role'
13 verbose_name = '用户权限管理'
14 verbose_name_plural = verbose_name
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -9,7 +9,7 @@ from settings import conf ...@@ -9,7 +9,7 @@ from settings import conf
9 from django.urls import reverse 9 from django.urls import reverse
10 from django.http import HttpResponseRedirect 10 from django.http import HttpResponseRedirect
11 from django.contrib.auth import login as auth_login 11 from django.contrib.auth import login as auth_login
12 from apps.doc.models import UserRole 12 from apps.account.models import UserRole
13 # from django.conf import settings 13 # from django.conf import settings
14 # from django.shortcuts import resolve_url, redirect 14 # from django.shortcuts import resolve_url, redirect
15 15
......
1 from django.contrib import admin 1 from django.contrib import admin
2 from .models import Keywords, Configs, UserRole 2 from .models import Keywords, Configs
3 from .named_enum import KeywordsType 3 from .named_enum import KeywordsType
4 from apps.myadmin.admin import admin_site 4 from apps.myadmin.admin import admin_site
5 5
...@@ -20,13 +20,7 @@ class ConfigsAdmin(admin.ModelAdmin): ...@@ -20,13 +20,7 @@ class ConfigsAdmin(admin.ModelAdmin):
20 list_display = ('id', 'value', 'comment') 20 list_display = ('id', 'value', 'comment')
21 21
22 22
23 # Register your models here.
24 class UserRoleAdmin(admin.ModelAdmin):
25 list_display = ('id', 'auth_user_id', 'role')
26
27
28 admin_site.register(Keywords, KeywordsAdmin) 23 admin_site.register(Keywords, KeywordsAdmin)
29 admin_site.register(Configs, ConfigsAdmin) 24 admin_site.register(Configs, ConfigsAdmin)
30 admin_site.register(UserRole, UserRoleAdmin)
31 # admin.site.site_header = '宝马OCR' 25 # admin.site.site_header = '宝马OCR'
32 # admin.site.site_title = '宝马OCR' 26 # admin.site.site_title = '宝马OCR'
......
...@@ -1098,14 +1098,4 @@ class HILCmsStatusInfo(models.Model): ...@@ -1098,14 +1098,4 @@ class HILCmsStatusInfo(models.Model):
1098 1098
1099 class Meta: 1099 class Meta:
1100 managed = False 1100 managed = False
1101 db_table = 'hil_cms_status_info'
1102 class UserRole(models.Model):
1103 id = models.AutoField(primary_key=True, verbose_name="id") # 主键
1104 auth_user_id = models.SmallIntegerField(null=False, default=0, verbose_name="auth_user_id")
1105 role = models.SmallIntegerField(null=False, default=0, verbose_name="role")
1106 menu_list = models.CharField(max_length=64, verbose_name="menu_list", blank=True)
1107
1108 class Meta:
1109 managed = False
1110 db_table = 'user_role'
1111 verbose_name = '用户权限管理'
...\ No newline at end of file ...\ No newline at end of file
1101 db_table = 'hil_cms_status_info'
...\ No newline at end of file ...\ No newline at end of file
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!