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

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

@@ -52,10 +52,10 @@ class ChangeRequestFormApproversSerializer(
                     else:
                         ret['editable_dept'] = True
                     # not instance.tmp_approver.delegation.code  or 
-                    # if instance.tmp_approver.delegation.name.lower() == 'requestor':
-                    #     ret['editable_deleg'] = False
-                    # else:
-                    #     ret['editable_deleg'] = True
+                    if instance.tmp_approver.delegation or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                        ret['editable_deleg'] = False
+                    else:
+                        ret['editable_deleg'] = True
 
                 else:
                     ret['editable_user'] = True
@@ -104,17 +104,17 @@ 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  or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         
-                    #     ret['delegation'] = {
-                    #         "id": instance.tmp_approver.delegation.id,
-                    #         "code": instance.tmp_approver.delegation.code,
-                    #         "name": instance.tmp_approver.delegation.name
-                    #     }
-                    #     ret['editable_deleg'] = False
-                    # else:
-                    #     ret['delegation'] = None
-                    #     ret['editable_deleg'] = True
+                        ret['delegation'] = {
+                            "id": instance.tmp_approver.delegation.id,
+                            "code": instance.tmp_approver.delegation.code,
+                            "name": instance.tmp_approver.delegation.name
+                        }
+                        ret['editable_deleg'] = False
+                    else:
+                        ret['delegation'] = None
+                        ret['editable_deleg'] = True
 
                 else:
                     ret['editable_user'] = True

app/applicationlayer/cms/utils_cr.py

@@ -692,7 +692,7 @@ def cancelled_user_trigger(form_code):
         Q(entity='CR_FRM_APPROVER') &
         Q(main_action='ACTION')
     ).values_list('modifiedby', flat=True).distinct()
-
+    
     received_approvers = models.User.objects.filter(
         username__in=received_approvers)