diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d6d17e3..1e8045a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,7 @@ - - - - @@ -143,7 +149,7 @@ true DEFINITION_ORDER - + - + @@ -602,16 +614,6 @@ - - - - - - - - - - @@ -702,7 +704,7 @@ - + @@ -717,26 +719,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -748,19 +730,47 @@ - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + diff --git a/apps/system/views_role.py b/apps/system/views_role.py index b10f814..3e43c34 100644 --- a/apps/system/views_role.py +++ b/apps/system/views_role.py @@ -5,13 +5,17 @@ import json from django.views.generic.base import View -from django.shortcuts import HttpResponse +from django.shortcuts import HttpResponse, get_object_or_404 from django.views.generic import TemplateView +from django.contrib.auth import get_user_model +from django.shortcuts import render from .mixin import LoginRequiredMixin from .models import Role from custom import SandboxCreateView, SandboxUpdateView +User = get_user_model() + class RoleView(LoginRequiredMixin, TemplateView): template_name = 'system/role.html' @@ -47,12 +51,6 @@ class RoleDeleteView(LoginRequiredMixin, View): return HttpResponse(json.dumps(ret), content_type='application/json') -from django.shortcuts import get_object_or_404 -from django.contrib.auth import get_user_model -from django.shortcuts import render - -User = get_user_model() - class Role2UserView(LoginRequiredMixin, View): """ 角色关联用户