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
28896518
Commit
28896518
authored
Oct 31, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #434 in RMS/api-main-service from gladys-dev2 to RMSv2
* commit '
dadde7d9
': rejected requestor
parents
042d8457
dadde7d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+1
-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 @
28896518
...
...
@@ -641,7 +641,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
)
change_request
.
cr_routing_actions
(
new_instance
,
current_user
)
# if action.lower() == 'approved':
# the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
...
...
app/businesslayer/changerequest/change_request.py
View file @
28896518
...
...
@@ -574,7 +574,7 @@ def cr_routing_actions(approver_instance, current_user):
remarks
,
level
)
prev_level
=
int
(
level
)
+
1
prev_level
=
int
(
level
)
-
1
# reset last vendor details
models
.
ChangeRequestFormApprovers
.
objects
.
filter
(
Q
(
form_code
=
form_code
)
&
...
...
@@ -710,7 +710,7 @@ def cr_routing_actions(approver_instance, current_user):
requestor_notification_msg
,
action
,
remarks
,
level
)
date_now
=
datetime
.
now
()
# update current approver details
update_form_approver
(
form_code
,
level
,
'current'
,
date_now
)
...
...
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