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
b986f27b
Commit
b986f27b
authored
Jan 20, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #689 in RMS/api-main-service from gladys-dev2 to product-dev
* commit '
72248a45
': completed action
parents
25d2be9b
72248a45
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+2
-1
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+2
-2
No files found.
app/applicationlayer/cms/form/header/views.py
View file @
b986f27b
...
...
@@ -735,7 +735,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
new_instance
)
change_request
.
cr_routing_actions
(
new_instance
,
current_user
,
move_to_level
)
# change_request.cr_routing_actions(new_instance, current_user, move_to_level)
change_request
.
cr_routing_actions
(
new_instance
,
original_user
,
move_to_level
)
# ---------------- removed code
message
=
status_message_response
(
200
,
'success'
,
...
...
app/businesslayer/changerequest/change_request.py
View file @
b986f27b
...
...
@@ -692,9 +692,9 @@ def cr_routing_actions(approver_instance, current_user, move_to_level):
if
(
the_last_vendor
and
current_user
==
the_last_vendor
.
user
.
code
and
level
==
the_last_vendor
.
level
):
update_form_header_status
(
form_code
,
'Approved'
)
else
:
the_next_vendor
=
check_vendor_level
(
'next'
,
next_level
,
form_code
)
...
...
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