Skip to content

R
red-ci-cd
Commit e660fcbc authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

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

parents 124d290a b1350602
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 4 deletions
app/applicationlayer/cms/form/approver/serializers.py
View file @ e660fcbc
...@@ -47,16 +47,24 @@ class ChangeRequestFormApproversSerializer( ...@@ -47,16 +47,24 @@ class ChangeRequestFormApproversSerializer(
else: else:
ret['editable_comp'] = True ret['editable_comp'] = True
if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor': 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
# not instance.tmp_approver.delegation.code or # not instance.tmp_approver.delegation.code or
if instance.tmp_approver.delegation or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.delegation:
ret['editable_deleg'] = False ret['editable_deleg'] = False
else: else:
ret['editable_deleg'] = True ret['editable_deleg'] = True
# 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
else: else:
ret['editable_user'] = True ret['editable_user'] = True
ret['editable_comp'] = True ret['editable_comp'] = True
...@@ -93,7 +101,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -93,7 +101,7 @@ class ChangeRequestFormApproversSerializer(
ret['company'] = None ret['company'] = None
ret['editable_comp'] = True ret['editable_comp'] = True
if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor': 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,
...@@ -104,7 +112,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -104,7 +112,7 @@ class ChangeRequestFormApproversSerializer(
ret['department'] = None ret['department'] = None
ret['editable_dept'] = True ret['editable_dept'] = True
if instance.tmp_approver.delegation or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.delegation:
ret['delegation'] = { ret['delegation'] = {
"id": instance.tmp_approver.delegation.id, "id": instance.tmp_approver.delegation.id,
...@@ -116,14 +124,23 @@ class ChangeRequestFormApproversSerializer( ...@@ -116,14 +124,23 @@ class ChangeRequestFormApproversSerializer(
ret['delegation'] = None ret['delegation'] = None
ret['editable_deleg'] = True 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
else: else:
ret['editable_user'] = True ret['editable_user'] = True
ret['editable_comp'] = True ret['editable_comp'] = True
ret['editable_dept'] = True ret['editable_dept'] = True
ret['editable_deleg'] = True
else: else:
ret['editable_user'] = False ret['editable_user'] = False
ret['editable_comp'] = False ret['editable_comp'] = False
ret['editable_dept'] = False ret['editable_dept'] = False
ret['editable_deleg'] = False
return ret return ret
......
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