Commit 27f8f8bb authored by Gladys Forte's avatar Gladys Forte

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

* commit '8ba82045':
  adjust draft archived
parents cf3c06c6 8ba82045
......@@ -135,8 +135,15 @@ class ChangeRequestFormHeaderSerializerList(
ret['requested_by'] = instance.requested_by_user.name
if instance.status.lower() == 'draft':
can_delete = True
elif instance.status.lower() == 'cancelled' or instance.status.lower() == 'closed':
existing_transaction = models.ChangeRequestHistory.objects.filter(
form_code=instance.form_code
)
if existing_transaction.count() > 0:
can_delete = False
else:
can_delete = True # hard delete
elif instance.status.lower() == 'cancelled':
can_delete = False
else:
can_delete = None
......
......@@ -446,7 +446,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
{"message": "Draft change request sucessfully archived"},
status=status.HTTP_200_OK)
elif current_status.status.lower() == 'cancelled' or current_status.status.lower() == 'closed':
elif current_status.status.lower() == 'cancelled':
models.ChangeRequestFormHeader.objects.filter(
form_code=form_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