Merge pull request #741 in RMS/api-main-service from core-dev-gladys to RMSv2

* commit 'a92d24f0':
  bug fix form approver serializer is editable

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

@@ -38,17 +38,17 @@ class ChangeRequestFormApproversSerializer(
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
                     
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.user:
                         ret['editable_user'] = False
                     else:
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.company:
                         ret['editable_comp'] = False
                     else:
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.department:
                         ret['editable_dept'] = False
                     else:
                         ret['editable_dept'] = True
@@ -60,11 +60,13 @@ class ChangeRequestFormApproversSerializer(
 
                     # print(instance.tmp_approver.delegation.name)
                     # comment
-                    # if instance.tmp_approver.delegation.name.lower() == 'requestor':
-                    #     ret['editable_user'] = False
-                    #     ret['editable_comp'] = False
-                    #     ret['editable_dept'] = False
-                    #     ret['editable_deleg'] = False
+
+                    if instance.tmp_approver.delegation:
+                        if instance.tmp_approver.delegation.name.lower() == 'requestor':
+                            ret['editable_user'] = False
+                            ret['editable_comp'] = False
+                            ret['editable_dept'] = False
+                            ret['editable_deleg'] = False
 
                 else:
                     ret['editable_user'] = True
@@ -84,13 +86,13 @@ class ChangeRequestFormApproversSerializer(
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
                     
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.user:
                         ret['editable_user'] = False
                     else:
                         ret['user'] = None
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.company:
                         ret['company'] = {
                            "id": instance.tmp_approver.company.id,
                            "code": instance.tmp_approver.company.code,
@@ -102,7 +104,7 @@ class ChangeRequestFormApproversSerializer(
                         ret['company'] = None
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.department:
                         ret['department'] = {
                             "id": instance.tmp_approver.department.id,
                             "code": instance.tmp_approver.department.code,
@@ -126,11 +128,12 @@ class ChangeRequestFormApproversSerializer(
                         ret['editable_deleg'] = True
 
                     # print(instance.tmp_approver.delegation.name)
-                    # if instance.tmp_approver.delegation.name.lower() == 'requestor':
-                    #     ret['editable_user'] = False
-                    #     ret['editable_comp'] = False
-                    #     ret['editable_dept'] = False
-                    #     ret['editable_deleg'] = False
+                    if instance.tmp_approver.delegation:
+                        if instance.tmp_approver.delegation.name.lower() == 'requestor':
+                            ret['editable_user'] = False
+                            ret['editable_comp'] = False
+                            ret['editable_dept'] = False
+                            ret['editable_deleg'] = False
 
                 else:
                     ret['editable_user'] = True