From 60208fe93450974e47689cf3b8b844dec521ab60 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 May 2020 10:10:39 +0800 Subject: [PATCH] delete soft --- test_server/crm/views.py | 2 +- test_server/rbac/models.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 9ae4fe1..a43a4ea 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -121,7 +121,7 @@ class ConsumerViewSet(ModelViewSet): """ ids = request.data.get('ids', None) if ids: - Consumer.objects.filter(id__in = ids).delete(soft=True) + Consumer.objects.filter(id__in = ids).delete(soft=False) return Response(status=status.HTTP_200_OK) @action(methods=['get'], detail=False, diff --git a/test_server/rbac/models.py b/test_server/rbac/models.py index e7bdc50..57958e2 100644 --- a/test_server/rbac/models.py +++ b/test_server/rbac/models.py @@ -10,12 +10,15 @@ class SoftDeletableQuerySetMixin(object): its ``is_deleted`` field to True. """ - def delete(self): + def delete(self, soft=True): """ Soft delete objects from queryset (set their ``is_deleted`` field to True) """ - self.update(is_delete=True) + if soft: + self.update(is_delete=True) + else: + return super(SoftDeletableQuerySetMixin, self).delete() class SoftDeletableQuerySet(SoftDeletableQuerySetMixin, QuerySet):