Skip to content

R
red-ci-cd
Commit ad908fe6 authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

bug fi

parent 860332ff
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
app/applicationlayer/cms/form/approver/serializers.py
View file @ ad908fe6
...@@ -37,17 +37,17 @@ class ChangeRequestFormApproversSerializer( ...@@ -37,17 +37,17 @@ class ChangeRequestFormApproversSerializer(
if instance.form_code.status == 'Draft': if instance.form_code.status == 'Draft':
if instance.tmp_approver: 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 ret['editable_user'] = False
else: else:
ret['editable_user'] = True 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 ret['editable_comp'] = False
else: else:
ret['editable_comp'] = True 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 ret['editable_dept'] = False
else: else:
ret['editable_dept'] = True ret['editable_dept'] = True
...@@ -57,7 +57,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -57,7 +57,7 @@ class ChangeRequestFormApproversSerializer(
else: else:
ret['editable_deleg'] = True ret['editable_deleg'] = True
print(instance.tmp_approver.delegation.name) # print(instance.tmp_approver.delegation.name)
# comment # comment
# if instance.tmp_approver.delegation.name.lower() == 'requestor': # if instance.tmp_approver.delegation.name.lower() == 'requestor':
# ret['editable_user'] = False # ret['editable_user'] = False
...@@ -83,13 +83,13 @@ class ChangeRequestFormApproversSerializer( ...@@ -83,13 +83,13 @@ class ChangeRequestFormApproversSerializer(
if instance.form_code.status == 'Draft': if instance.form_code.status == 'Draft':
if instance.tmp_approver: 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 ret['editable_user'] = False
else: else:
ret['user'] = None ret['user'] = None
ret['editable_user'] = True ret['editable_user'] = True
if instance.tmp_approver.company: if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
ret['company'] = { ret['company'] = {
"id": instance.tmp_approver.company.id, "id": instance.tmp_approver.company.id,
"code": instance.tmp_approver.company.code, "code": instance.tmp_approver.company.code,
...@@ -101,7 +101,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -101,7 +101,7 @@ class ChangeRequestFormApproversSerializer(
ret['company'] = None ret['company'] = None
ret['editable_comp'] = True ret['editable_comp'] = True
if instance.tmp_approver.department: if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor':
ret['department'] = { ret['department'] = {
"id": instance.tmp_approver.department.id, "id": instance.tmp_approver.department.id,
"code": instance.tmp_approver.department.code, "code": instance.tmp_approver.department.code,
...@@ -124,7 +124,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -124,7 +124,7 @@ class ChangeRequestFormApproversSerializer(
ret['delegation'] = None ret['delegation'] = None
ret['editable_deleg'] = True ret['editable_deleg'] = True
print(instance.tmp_approver.delegation.name) # print(instance.tmp_approver.delegation.name)
# if instance.tmp_approver.delegation.name.lower() == 'requestor': # if instance.tmp_approver.delegation.name.lower() == 'requestor':
# ret['editable_user'] = False # ret['editable_user'] = False
# ret['editable_comp'] = False # ret['editable_comp'] = False
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment