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
4bacf8a9
Commit
4bacf8a9
authored
Jan 28, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restrict a requestor to submit a CR without atleast 1 approver
parent
e38d975e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+13
-3
app/applicationlayer/cms/template/header/views.py
app/applicationlayer/cms/template/header/views.py
+1
-1
No files found.
app/applicationlayer/cms/form/header/views.py
View file @
4bacf8a9
...
...
@@ -1206,7 +1206,7 @@ class ChangeRequestFormPost(APIView):
'template_no'
:
form_header
[
'template_no'
]
}
#
sp1 = transaction.savepoint() # nothing will save to db
sp1
=
transaction
.
savepoint
()
# nothing will save to db
serializer
=
ChangeRequestFormHeaderSerializer
(
data
=
form_header_data
)
...
...
@@ -1233,6 +1233,16 @@ class ChangeRequestFormPost(APIView):
frm_approver
[
'form_code'
]
=
frm_id
counter
=
counter
+
1
data_list_approver
.
append
(
frm_approver
)
if
counter
==
2
and
serializer
.
data
[
'status'
]
.
lower
()
==
'pending'
:
transaction
.
savepoint_rollback
(
sp1
)
message
=
{
'code'
:
400
,
'status'
:
'failed'
,
'message'
:
'Please select at least 1 approver before submitting this request.'
,
}
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
serializerApprover
=
ChangeRequestFormApproversSerializer
(
data
=
data_list_approver
,
many
=
True
)
...
...
@@ -1364,7 +1374,7 @@ class ChangeRequestFormPost(APIView):
return
Response
(
message
,
status
=
status
.
HTTP_201_CREATED
)
except
ValidationError
as
e
:
#
transaction.savepoint_rollback(sp1)
transaction
.
savepoint_rollback
(
sp1
)
message
=
{
'code'
:
400
,
'status'
:
'failed'
,
...
...
@@ -1373,7 +1383,7 @@ class ChangeRequestFormPost(APIView):
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
except
Exception
as
e
:
#
transaction.savepoint_rollback(sp1)
transaction
.
savepoint_rollback
(
sp1
)
message
=
{
'code'
:
500
,
'status'
:
'failed'
,
...
...
app/applicationlayer/cms/template/header/views.py
View file @
4bacf8a9
...
...
@@ -391,7 +391,7 @@ class ChangeRequestTemplatePost(APIView):
if
serializerApprover
.
is_valid
(
raise_exception
=
True
):
serializerApprover
.
save
()
# create template stakes
if
template_header
[
'tmp_stakes'
]:
tmp_stakes
=
template_header
[
'tmp_stakes'
]
...
...
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