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

* commit 'ad908fe6':
  bug fi

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

@@ -37,17 +37,17 @@ class ChangeRequestFormApproversSerializer(
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
                     
-                    if instance.tmp_approver.user:
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_user'] = False
                     else:
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company:
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_comp'] = False
                     else:
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department:
+                    if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_dept'] = False
                     else:
                         ret['editable_dept'] = True
@@ -57,7 +57,7 @@ class ChangeRequestFormApproversSerializer(
                     else:
                         ret['editable_deleg'] = True
 
-                    print(instance.tmp_approver.delegation.name)
+                    # print(instance.tmp_approver.delegation.name)
                     # comment
                     # if instance.tmp_approver.delegation.name.lower() == 'requestor':
                     #     ret['editable_user'] = False
@@ -83,13 +83,13 @@ class ChangeRequestFormApproversSerializer(
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
                     
-                    if instance.tmp_approver.user:
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_user'] = False
                     else:
                         ret['user'] = None
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company:
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['company'] = {
                            "id": instance.tmp_approver.company.id,
                            "code": instance.tmp_approver.company.code,
@@ -101,7 +101,7 @@ class ChangeRequestFormApproversSerializer(
                         ret['company'] = None
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department:
+                    if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['department'] = {
                             "id": instance.tmp_approver.department.id,
                             "code": instance.tmp_approver.department.code,
@@ -124,7 +124,7 @@ class ChangeRequestFormApproversSerializer(
                         ret['delegation'] = None
                         ret['editable_deleg'] = True
 
-                    print(instance.tmp_approver.delegation.name)
+                    # print(instance.tmp_approver.delegation.name)
                     # if instance.tmp_approver.delegation.name.lower() == 'requestor':
                     #     ret['editable_user'] = False
                     #     ret['editable_comp'] = False