Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

app/applicationlayer/cms/form/attachment/serializers.py

@@ -32,7 +32,7 @@ class ChangeRequestFormAttachmentsSerializer(
 class ChangeRequestFormAttachmentsFileUploadSerializer(
     serializers.ModelSerializer
 ):
-    
+
     class Meta:
         model = models.ChangeRequestFormAttachments
         fields = (
@@ -40,6 +40,8 @@ class ChangeRequestFormAttachmentsFileUploadSerializer(
             'attachment_name',
             'file_name',
             'description',
-            'file_upload'
+            'file_upload',
+            'uploaded_by',
+            'form_code'
         )
         # read_only_fields = ['created', 'code']
\ No newline at end of file

app/businesslayer/changerequest/change_request.py

@@ -371,17 +371,21 @@ def attachment_add_edit_delete(form_request_body,
             }
             data = {**i, **frm_code}
 
-            serializer = serializer_data(frm_instance,
-                                         data=data,
-                                         partial=partial)
-
-            serializer.is_valid(raise_exception=True)
             old_instance = model_to_dict(frm_instance)
             
             if not data_old == i:
+                
+                serializer = serializer_data(frm_instance,
+                                data=data,
+                                partial=partial)
+
+                serializer.is_valid(raise_exception=True)
+
                 self.perform_update(serializer)
                 new_instance = serializer.data
-                # comment
+                # 
+                
+                print(new_instance)
                 crhistory_save(
                     batch_no,
                     main_action,