add device id to stake holder serialzier
This commit is contained in:
@@ -106,7 +106,7 @@ class PermissionViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
|
|||||||
def connectionless_permissions(self, request, *args, **kwargs):
|
def connectionless_permissions(self, request, *args, **kwargs):
|
||||||
""" get all permissions that are not assigned to any user relation """
|
""" get all permissions that are not assigned to any user relation """
|
||||||
|
|
||||||
permissions = Permissions.objects.annotate(num=Count('userrelations')).filter(num=0)
|
permissions = Permissions.objects.annotate(num=Count('userrelations')).filter(num=0) # noqa
|
||||||
|
|
||||||
page = self.paginate_queryset(permissions)
|
page = self.paginate_queryset(permissions)
|
||||||
if page is not None:
|
if page is not None:
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ class StakeHoldersSerializer(ModelSerializer):
|
|||||||
).data
|
).data
|
||||||
|
|
||||||
representation['device'] = instance.device.device_identity
|
representation['device'] = instance.device.device_identity
|
||||||
|
representation['device_id'] = instance.device.id
|
||||||
|
|
||||||
representation['organization'] = {
|
representation['organization'] = {
|
||||||
'name': instance.organization.name,
|
'name': instance.organization.name,
|
||||||
|
|||||||
@@ -64,7 +64,8 @@ def update_quota_remaining(sender, instance, **kwargs):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# when delete object, prevent from update fields error
|
# when delete object, prevent from update fields error
|
||||||
if kwargs.get('signal') == post_delete:
|
# if kwargs.get('signal') == post_delete:
|
||||||
|
if instance.trash:
|
||||||
if instance.parent_distribution:
|
if instance.parent_distribution:
|
||||||
remaining_distribution_weight(instance.parent_distribution)
|
remaining_distribution_weight(instance.parent_distribution)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user