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
c2e630c8
Commit
c2e630c8
authored
Oct 18, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added is editable to template approver
parent
b964ccad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
3 deletions
+22
-3
app/applicationlayer/cms/form/approver/serializers.py
app/applicationlayer/cms/form/approver/serializers.py
+14
-1
app/applicationlayer/cms/template/approver/serializers.py
app/applicationlayer/cms/template/approver/serializers.py
+8
-2
No files found.
app/applicationlayer/cms/form/approver/serializers.py
View file @
c2e630c8
...
@@ -40,7 +40,20 @@ class ChangeRequestFormApproversSerializer(
...
@@ -40,7 +40,20 @@ class ChangeRequestFormApproversSerializer(
ret
[
'user'
]
=
"none"
ret
[
'user'
]
=
"none"
ret
[
'department'
]
=
"none"
ret
[
'department'
]
=
"none"
ret
[
'company'
]
=
"none"
ret
[
'company'
]
=
"none"
ret
[
'is_editable'
]
=
None
if
instance
.
tmp_approver
:
if
instance
.
form_code
.
status
==
''
or
instance
.
form_code
.
status
==
'Draft'
:
if
instance
.
tmp_approver
.
delegation
.
lower
()
==
'requestor'
:
ret
[
'is_editable'
]
=
False
elif
instance
.
tmp_approver
.
user
:
ret
[
'is_editable'
]
=
False
else
:
ret
[
'is_editable'
]
=
True
else
:
ret
[
'is_editable'
]
=
False
else
:
ret
[
'is_editable'
]
=
False
return
ret
return
ret
class
Meta
:
class
Meta
:
...
...
app/applicationlayer/cms/template/approver/serializers.py
View file @
c2e630c8
...
@@ -27,13 +27,19 @@ class ChangeRequestTemplateApproversSerializer(
...
@@ -27,13 +27,19 @@ class ChangeRequestTemplateApproversSerializer(
ret
[
'is_editable'
]
=
False
ret
[
'is_editable'
]
=
False
else
:
else
:
ret
[
'is_editable'
]
=
True
ret
[
'is_editable'
]
=
True
return
ret
return
ret
except
Exception
as
e
:
except
Exception
as
e
:
ret
[
'company'
]
=
"none"
ret
[
'company'
]
=
"none"
ret
[
'department'
]
=
"none"
ret
[
'department'
]
=
"none"
ret
[
'name'
]
=
"none"
ret
[
'name'
]
=
"none"
ret
[
'is_editable'
]
=
True
if
instance
.
delegation
.
lower
()
==
'requestor'
:
ret
[
'is_editable'
]
=
False
elif
instance
.
user
:
ret
[
'is_editable'
]
=
False
else
:
ret
[
'is_editable'
]
=
True
return
ret
return
ret
...
...
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