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
7922187d
Commit
7922187d
authored
Oct 17, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #392 in RMS/api-main-service from gladys-dev2 to RMSv2
* commit '
71949aa2
': fix rejected
parents
02810084
71949aa2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+3
-4
No files found.
app/applicationlayer/cms/form/header/views.py
View file @
7922187d
...
...
@@ -793,6 +793,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
)
if
not
prev_vendor
.
count
()
>
0
:
print
(
"pasok"
)
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
form_code
=
form_code
)
.
update
(
status
=
'Rejected'
)
...
...
@@ -836,10 +837,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
action_date
=
datetime
.
now
(),
date_sent
=
datetime
.
now
()
)
# update is_action for current level
if
last_action_vendor
:
level
=
last_action_vendor
.
level
+
1
level
=
last_action_vendor
.
level
+
1
models
.
ChangeRequestFormApprovers
.
objects
.
filter
(
Q
(
form_code
=
form_code
)
&
Q
(
level__gte
=
int
(
level
))
...
...
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