Commit d3c08d95 authored by Gladys Forte's avatar Gladys Forte

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

* commit 'ddf16cc4':
  attachment
parents 8fcb23a9 ddf16cc4
...@@ -356,7 +356,7 @@ def attachment_add_edit_delete(form_request_body, ...@@ -356,7 +356,7 @@ def attachment_add_edit_delete(form_request_body,
frm_instance = queryset.objects.get( frm_instance = queryset.objects.get(
pk=i['id'] pk=i['id']
) )
data_old = { data_old = {
'id': frm_instance.id, 'id': frm_instance.id,
'attachment_type': frm_instance.attachment_type, 'attachment_type': frm_instance.attachment_type,
...@@ -365,6 +365,15 @@ def attachment_add_edit_delete(form_request_body, ...@@ -365,6 +365,15 @@ def attachment_add_edit_delete(form_request_body,
'description': frm_instance.description, 'description': frm_instance.description,
'file_upload': frm_instance.file_upload.id 'file_upload': frm_instance.file_upload.id
} }
data_new = {
'id': i['id'],
'attachment_type': i['attachment_type'],
'attachment_name': i['attachment_name'],
'file_name': i['file_name'],
'description': i['description'],
'file_upload': i['file_upload']
}
frm_code = { frm_code = {
"form_code": form_code, "form_code": form_code,
...@@ -374,8 +383,7 @@ def attachment_add_edit_delete(form_request_body, ...@@ -374,8 +383,7 @@ def attachment_add_edit_delete(form_request_body,
old_instance = model_to_dict(frm_instance) old_instance = model_to_dict(frm_instance)
if not data_old == i: if not data_old == data_new:
serializer = serializer_data(frm_instance, serializer = serializer_data(frm_instance,
data=data, data=data,
partial=partial) partial=partial)
...@@ -386,7 +394,7 @@ def attachment_add_edit_delete(form_request_body, ...@@ -386,7 +394,7 @@ def attachment_add_edit_delete(form_request_body,
new_instance = serializer.data new_instance = serializer.data
# #
print(new_instance) # print(new_instance)
crhistory_save( crhistory_save(
batch_no, batch_no,
main_action, main_action,
......
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