Commit 88a8ee0e authored by Gladys Forte's avatar Gladys Forte

Merge pull request #447 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit 'efea3299':
  update fix
parents e5639531 efea3299
...@@ -116,13 +116,16 @@ class DelegationViewSet(viewsets.ModelViewSet): ...@@ -116,13 +116,16 @@ class DelegationViewSet(viewsets.ModelViewSet):
@transaction.atomic @transaction.atomic
def update(self, request, *args, **kwargs): def update(self, request, *args, **kwargs):
partial = kwargs.pop('partial', False) partial = kwargs.pop('partial', True)
instance = self.get_object() instance = self.get_object()
serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer = self.get_serializer(
instance,
data=request.data,
partial=partial)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
old_instance = model_to_dict(instance) old_instance = model_to_dict(instance)
# restriction # restriction
if not (old_instance['name'].lower() == 'head of department' or if not (old_instance['name'].lower() == 'head of department' or
old_instance['name'].lower() == 'sd/od' or old_instance['name'].lower() == 'sd/od' or
...@@ -133,7 +136,7 @@ class DelegationViewSet(viewsets.ModelViewSet): ...@@ -133,7 +136,7 @@ class DelegationViewSet(viewsets.ModelViewSet):
self.perform_update(serializer) self.perform_update(serializer)
new_instance = serializer.data new_instance = serializer.data
log_save( log_save(
enums.LogEnum.DELETED.value, enums.LogEnum.DELETED.value,
enums.LogEntitiesEnum.DELEGATION.value, enums.LogEntitiesEnum.DELEGATION.value,
......
...@@ -100,7 +100,6 @@ class Delegation(AuditClass): ...@@ -100,7 +100,6 @@ class Delegation(AuditClass):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
super(Delegation, self).save(*args, **kwargs) super(Delegation, self).save(*args, **kwargs)
code = enums.GenerateCode.DELEGATION.value
code = number_generator(enums.GenerateCode.DELEGATION.value, self.id) code = number_generator(enums.GenerateCode.DELEGATION.value, self.id)
Delegation.objects.filter(id=self.id).update(code=code) Delegation.objects.filter(id=self.id).update(code=code)
......
Markdown is supported
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