Skip to content

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

bug fix form approver serializer is editable

parent b15db2f6
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 18 deletions
app/applicationlayer/cms/form/approver/serializers.py
View file @ a92d24f0
...@@ -38,17 +38,17 @@ class ChangeRequestFormApproversSerializer( ...@@ -38,17 +38,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 or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.user:
ret['editable_user'] = False ret['editable_user'] = False
else: else:
ret['editable_user'] = True 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 ret['editable_comp'] = False
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:
ret['editable_dept'] = False ret['editable_dept'] = False
else: else:
ret['editable_dept'] = True ret['editable_dept'] = True
...@@ -60,11 +60,13 @@ class ChangeRequestFormApproversSerializer( ...@@ -60,11 +60,13 @@ class ChangeRequestFormApproversSerializer(
# print(instance.tmp_approver.delegation.name) # print(instance.tmp_approver.delegation.name)
# comment # comment
# if instance.tmp_approver.delegation.name.lower() == 'requestor':
# ret['editable_user'] = False if instance.tmp_approver.delegation:
# ret['editable_comp'] = False if instance.tmp_approver.delegation.name.lower() == 'requestor':
# ret['editable_dept'] = False ret['editable_user'] = False
# ret['editable_deleg'] = False ret['editable_comp'] = False
ret['editable_dept'] = False
ret['editable_deleg'] = False
else: else:
ret['editable_user'] = True ret['editable_user'] = True
...@@ -84,13 +86,13 @@ class ChangeRequestFormApproversSerializer( ...@@ -84,13 +86,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 or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.user:
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 or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.company:
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,
...@@ -102,7 +104,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -102,7 +104,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:
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,
...@@ -126,12 +128,13 @@ class ChangeRequestFormApproversSerializer( ...@@ -126,12 +128,13 @@ class ChangeRequestFormApproversSerializer(
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:
# ret['editable_user'] = False if instance.tmp_approver.delegation.name.lower() == 'requestor':
# ret['editable_comp'] = False ret['editable_user'] = False
# ret['editable_dept'] = False ret['editable_comp'] = False
# ret['editable_deleg'] = 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
......
app/applicationlayer/cms/template/header/views.py
View file @ a92d24f0
...@@ -357,7 +357,7 @@ class ChangeRequestTemplatePost(APIView): ...@@ -357,7 +357,7 @@ class ChangeRequestTemplatePost(APIView):
# } # }
# return Response(message, # return Response(message,
# status=status.HTTP_400_BAD_REQUEST) # status=status.HTTP_400_BAD_REQUEST)
data_list_approver = [] data_list_approver = []
data_list_stake = [] data_list_stake = []
data_list_attach = [] data_list_attach = []
......
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