Commit 4cf5573c authored by xinwen's avatar xinwen Committed by 老广
Browse files

fix(users): 修复用户与用户组关系变化时没触发信号

parent 962ea67b
Showing with 6 additions and 6 deletions
+6 -6
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from rest_framework_bulk import BulkModelViewSet
from django.db.models import F from django.db.models import F
from common.drf.api import JMSBulkRelationModelViewSet
from common.permissions import IsOrgAdmin from common.permissions import IsOrgAdmin
from .. import serializers from .. import serializers
from ..models import User from ..models import User
...@@ -11,17 +11,17 @@ from ..models import User ...@@ -11,17 +11,17 @@ from ..models import User
__all__ = ['UserUserGroupRelationViewSet'] __all__ = ['UserUserGroupRelationViewSet']
class UserUserGroupRelationViewSet(BulkModelViewSet): class UserUserGroupRelationViewSet(JMSBulkRelationModelViewSet):
filter_fields = ('user', 'usergroup') filter_fields = ('user', 'usergroup')
search_fields = filter_fields search_fields = filter_fields
serializer_class = serializers.UserUserGroupRelationSerializer serializer_class = serializers.UserUserGroupRelationSerializer
permission_classes = (IsOrgAdmin,) permission_classes = (IsOrgAdmin,)
m2m_field = User.groups.field
def get_queryset(self): def get_queryset(self):
queryset = User.groups.through.objects.all()\ return super().get_queryset().annotate(
.annotate(user_display=F('user__name'))\ user_display=F('user__name'), usergroup_display=F('usergroup__name')
.annotate(usergroup_display=F('usergroup__name')) )
return queryset
def allow_bulk_destroy(self, qs, filtered): def allow_bulk_destroy(self, qs, filtered):
if filtered.count() != 1: if filtered.count() != 1:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment