Skip to content

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

bug fix 2

parent 2f9cdaee
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
app/applicationlayer/cms/form/approver/serializers.py
View file @ ec9c9d0e
...@@ -36,7 +36,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -36,7 +36,7 @@ class ChangeRequestFormApproversSerializer(
if instance.form_code.status == 'Draft': if instance.form_code.status == 'Draft':
if instance.tmp_approver: if instance.tmp_approver:
print(instance.tmp_approver.delegation.name.lower()) print(instance.tmp_approver.delegation)
if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
ret['editable_user'] = False ret['editable_user'] = False
else: else:
...@@ -74,6 +74,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -74,6 +74,7 @@ class ChangeRequestFormApproversSerializer(
if instance.form_code.status == 'Draft': if instance.form_code.status == 'Draft':
if instance.tmp_approver: if instance.tmp_approver:
print(instance.tmp_approver.delegation)
if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
ret['editable_user'] = False ret['editable_user'] = False
else: else:
...@@ -103,17 +104,17 @@ class ChangeRequestFormApproversSerializer( ...@@ -103,17 +104,17 @@ class ChangeRequestFormApproversSerializer(
ret['department'] = None ret['department'] = None
ret['editable_dept'] = True ret['editable_dept'] = True
if instance.tmp_approver.delegation.code or instance.tmp_approver.delegation.name.lower() == 'requestor': # if instance.tmp_approver.delegation.code or instance.tmp_approver.delegation.name.lower() == 'requestor':
ret['delegation'] = { # ret['delegation'] = {
"id": instance.tmp_approver.delegation.id, # "id": instance.tmp_approver.delegation.id,
"code": instance.tmp_approver.delegation.code, # "code": instance.tmp_approver.delegation.code,
"name": instance.tmp_approver.delegation.name # "name": instance.tmp_approver.delegation.name
} # }
ret['editable_deleg'] = False # ret['editable_deleg'] = False
else: # else:
ret['delegation'] = None # ret['delegation'] = None
ret['editable_deleg'] = True # ret['editable_deleg'] = True
else: else:
ret['editable_user'] = True ret['editable_user'] = True
......
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