Serializer GroupMember-ships and Groups in User details view

ProjetSigma · Feb 3, 2016 · b944b47 · b944b47
1 parent 8d492e2
commit b944b47
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/sigma_core/serializers/group_member.py b/sigma_core/serializers/group_member.py
@@ -3,12 +3,17 @@
 from sigma_core.models.user import User
 from sigma_core.models.group import Group
 from sigma_core.models.group_member import GroupMember
+from sigma_core.serializers.group import GroupSerializer
+
+
+class GroupMemberSerializerMeta(object):
+    model = GroupMember
+    read_only_fields = ('perm_rank', )
 
 
 class GroupMemberSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = GroupMember
-        read_only_fields = ('perm_rank', )
+    class Meta(GroupMemberSerializerMeta):
+        pass
 
     user = serializers.PrimaryKeyRelatedField(queryset=User.objects.all())
     group = serializers.PrimaryKeyRelatedField(queryset=Group.objects.all())
@@ -18,3 +23,10 @@ def create(self, validated_data):
         mem.perm_rank = mem.group.default_member_rank
         mem.save()
         return mem
+
+
+class GroupMemberSerializer_Group(GroupMemberSerializer):
+    class Meta(GroupMemberSerializerMeta):
+        read_only_fields = GroupMemberSerializerMeta.read_only_fields = ('group', )
+
+    group = GroupSerializer()
diff --git a/sigma_core/serializers/user.py b/sigma_core/serializers/user.py
@@ -42,7 +42,7 @@ class Meta(BasicUserSerializerMeta):
         exclude = ('is_staff', 'is_superuser', )
         read_only_fields = BasicUserSerializerMeta.read_only_fields + ('invited_to_groups', )
 
-    memberships = serializers.PrimaryKeyRelatedField(read_only=True, many=True)
+    memberships = GroupMemberSerializer_Group(read_only=True, many=True)
 
 
 class DetailedUserWithPermsSerializer(DetailedUserSerializer):