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

* commit '9b24548a':
  bug fix serializer approver

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

@@ -51,7 +51,7 @@ class ChangeRequestFormApproversSerializer(
                     else:
                         ret['editable_dept'] = True
                     
-                    if instance.tmp_approver.delegation  or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.delegation.code  or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_deleg'] = False
                     else:
                         ret['editable_deleg'] = True
@@ -102,7 +102,8 @@ class ChangeRequestFormApproversSerializer(
                         ret['department'] = None
                         ret['editable_dept'] = True
 
-                    if instance.tmp_approver.delegation  or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.delegation.code  or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                        
                         ret['delegation'] = {
                             "id": instance.tmp_approver.delegation.id,
                             "code": instance.tmp_approver.delegation.code,

app/applicationlayer/cms/utils_cr.py

@@ -485,7 +485,7 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code,
     try:
         for data in queryset:
             test = model_to_dict(data)
-            print(test)
+            # print(test)
             crhistory_save(batch_no,
                            main_action,
                            enums.CREnum.DELETED.value,
@@ -496,21 +496,21 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code,
             
             tbl.objects.filter(id=test['id']).delete()
 
-            url = models.MasterAttachment.objects.get(id=test['file_upload'])
-            models.MasterAttachment.objects.filter(
-                id=test['file_upload']).delete()
-            r = model_to_dict(url)
-            print(r['url'])
-            
-            print(settings.MEDIA_ROOT)
-            # os.remove(r['url'])
-            x = os.path.join(settings.MEDIA_ROOT, r['url'])
-            print(x)
-            if os.path.exists(os.path.join(settings.MEDIA_ROOT, r['url'])):
-                print("file exists")
-                # os.remove(r['url'])
-            else:
-                print("The file does not exist")
+            # url = models.MasterAttachment.objects.get(id=test['file_upload'])
+            # models.MasterAttachment.objects.filter(
+            #     id=test['file_upload']).delete()
+            # r = model_to_dict(url)
+            # print(r['url'])
+            
+            # print(settings.MEDIA_ROOT)
+            # # os.remove(r['url'])
+            # x = os.path.join(settings.MEDIA_ROOT, r['url'])
+            # print(x)
+            # if os.path.exists(os.path.join(settings.MEDIA_ROOT, r['url'])):
+            #     print("file exists")
+            #     # os.remove(r['url'])
+            # else:
+            #     print("The file does not exist")
 
         return True
     except IntegrityError as exc: