Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
red-group-test
red-ci-cd
Commits
28b560c0
Commit
28b560c0
authored
Jan 30, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
template approver is editable fix
parent
1c63ccdb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
app/applicationlayer/cms/form/approver/serializers.py
app/applicationlayer/cms/form/approver/serializers.py
+1
-1
app/applicationlayer/cms/template/approver/serializers.py
app/applicationlayer/cms/template/approver/serializers.py
+9
-8
No files found.
app/applicationlayer/cms/form/approver/serializers.py
View file @
28b560c0
...
@@ -131,7 +131,7 @@ class ChangeRequestFormApproversSerializer(
...
@@ -131,7 +131,7 @@ class ChangeRequestFormApproversSerializer(
# ret['editable_comp'] = False
# ret['editable_comp'] = False
# ret['editable_dept'] = False
# ret['editable_dept'] = False
# ret['editable_deleg'] = 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/approver/serializers.py
View file @
28b560c0
...
@@ -22,7 +22,7 @@ class ChangeRequestTemplateApproversSerializer(
...
@@ -22,7 +22,7 @@ class ChangeRequestTemplateApproversSerializer(
ret
[
'editable_comp'
]
=
True
ret
[
'editable_comp'
]
=
True
if
instance
.
department
:
if
instance
.
department
:
ret
[
'department'
]
=
{
ret
[
'department'
]
=
{
"id"
:
instance
.
department
.
id
,
"id"
:
instance
.
department
.
id
,
"code"
:
instance
.
department
.
code
,
"code"
:
instance
.
department
.
code
,
...
@@ -33,7 +33,7 @@ class ChangeRequestTemplateApproversSerializer(
...
@@ -33,7 +33,7 @@ class ChangeRequestTemplateApproversSerializer(
ret
[
'editable_dept'
]
=
True
ret
[
'editable_dept'
]
=
True
if
instance
.
user
:
if
instance
.
user
:
user_object
=
{
user_object
=
{
"id"
:
instance
.
user
.
id
,
"id"
:
instance
.
user
.
id
,
"name"
:
instance
.
user
.
name
,
"name"
:
instance
.
user
.
name
,
...
@@ -59,12 +59,13 @@ class ChangeRequestTemplateApproversSerializer(
...
@@ -59,12 +59,13 @@ class ChangeRequestTemplateApproversSerializer(
else
:
else
:
ret
[
'editable_deleg'
]
=
True
ret
[
'editable_deleg'
]
=
True
if
instance
.
delegation
.
name
.
lower
()
==
'requestor'
:
if
instance
.
delegation
:
if
instance
.
delegation
.
name
.
lower
()
==
'requestor'
or
instance
.
delegation
.
name
.
lower
()
==
'vendor/implementor'
:
ret
[
'editable_user'
]
=
False
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
return
ret
return
ret
except
Exception
as
e
:
except
Exception
as
e
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment