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
e2ce6987
Commit
e2ce6987
authored
Sep 30, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #223 in RMS/api-main-service from gladys-dev2 to RMSv2
* commit '
610c4afc
': action_required
parents
63a90cb8
610c4afc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/applicationlayer/cms/form/header/serializers.py
app/applicationlayer/cms/form/header/serializers.py
+4
-4
No files found.
app/applicationlayer/cms/form/header/serializers.py
View file @
e2ce6987
...
...
@@ -33,7 +33,7 @@ class ChangeRequestFormHeaderSerializer(
(
Q
(
action
=
''
)
|
Q
(
action
=
None
))
)
.
order_by
(
'level'
)
if
current_level
[
0
]
.
user
.
code
==
id_number
:
if
current_level
.
count
()
>
0
and
current_level
[
0
]
.
user
.
code
==
id_number
:
if
instance
.
status
.
lower
()
==
'rejected'
:
approver
=
'No'
elif
instance
.
status
.
lower
()
==
'cancelled'
:
...
...
@@ -73,7 +73,7 @@ class ChangeRequestFormHeaderSerializer(
return
ret
except
Exception
as
e
:
ret
[
'action'
]
=
"None"
ret
[
'action
_required
'
]
=
"None"
ret
[
'requested_to_company'
]
=
"None"
ret
[
'requested_to_department'
]
=
"None"
ret
[
'requested_to_user'
]
=
"None"
...
...
@@ -125,14 +125,14 @@ class ChangeRequestFormHeaderSerializerList(
else
:
approver
=
'No'
ret
[
'action'
]
=
approver
ret
[
'action
_required
'
]
=
approver
ret
[
'company'
]
=
instance
.
requested_to_company
.
name
ret
[
'department'
]
=
instance
.
requested_to_department
.
name
ret
[
'requested_by'
]
=
instance
.
requested_by_user
.
name
return
ret
except
Exception
as
e
:
ret
[
'action'
]
=
"No"
ret
[
'action
_required
'
]
=
"No"
ret
[
'company'
]
=
"None"
ret
[
'department'
]
=
"None"
ret
[
'requested_by'
]
=
"None"
...
...
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