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
1c63ccdb
Commit
1c63ccdb
authored
Jan 30, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
validation form
parent
85672b37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
20 deletions
+9
-20
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+8
-9
app/businesslayer/changerequest/change_request_template.py
app/businesslayer/changerequest/change_request_template.py
+1
-11
No files found.
app/applicationlayer/cms/form/header/views.py
View file @
1c63ccdb
...
@@ -1182,21 +1182,20 @@ class ChangeRequestFormPost(APIView):
...
@@ -1182,21 +1182,20 @@ class ChangeRequestFormPost(APIView):
def
post
(
self
,
request
):
def
post
(
self
,
request
):
form_header
=
request
.
data
form_header
=
request
.
data
try
:
try
:
frm_approvers
=
form_header
[
'frm_approvers'
]
# restrict superuser department
# Routing Validations
if
(
form_header
[
'requested_by_department'
]
==
'DEPARTMENT-20190923-0000001'
or
form_header
[
'requested_to_department'
]
==
'DEPARTMENT-20190923-0000001'
):
result
=
change_request_template
.
validation_superuser_department
(
frm_approvers
)
if
result
is
True
:
message
=
{
message
=
{
'code'
:
400
,
'code'
:
400
,
'status'
:
'failed'
,
'status'
:
'failed'
,
'message'
:
'
Please remove Super User Department into routing table
'
,
'message'
:
'
Superuser department cannot be selected
'
,
}
}
return
Response
(
message
,
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
status
=
status
.
HTTP_400_BAD_REQUEST
)
frm_approvers
=
form_header
[
'frm_approvers'
]
# Check if Vendor and Requestor are existing on routing table
# Check if Vendor and Requestor are existing on routing table
if
len
(
frm_approvers
)
<
2
:
if
len
(
frm_approvers
)
<
2
:
message
=
{
message
=
{
...
@@ -1239,7 +1238,7 @@ class ChangeRequestFormPost(APIView):
...
@@ -1239,7 +1238,7 @@ class ChangeRequestFormPost(APIView):
'message'
:
'Please select at least 1 approver before submitting this request.'
,
'message'
:
'Please select at least 1 approver before submitting this request.'
,
}
}
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
data_list_approver
=
[]
data_list_approver
=
[]
data_list_stake
=
[]
data_list_stake
=
[]
data_list_attach
=
[]
data_list_attach
=
[]
...
...
app/businesslayer/changerequest/change_request_template.py
View file @
1c63ccdb
...
@@ -106,16 +106,6 @@ def tmp_add_edit_delete(tmp_request_body,
...
@@ -106,16 +106,6 @@ def tmp_add_edit_delete(tmp_request_body,
return
True
return
True
# Check if superuser department included in routing table
def
validation_superuser_department
(
approvers
):
for
approver
in
approvers
:
if
approver
[
'delegation'
]
==
'DEPARTMENT-20190923-0000001'
:
return
True
else
:
return
False
# Check if routing table has Vendor and Requestor
# Check if routing table has Vendor and Requestor
def
validation_existing_vendor_requestor
(
approvers
):
def
validation_existing_vendor_requestor
(
approvers
):
...
@@ -165,5 +155,5 @@ def validation_approver_same_level(approvers):
...
@@ -165,5 +155,5 @@ def validation_approver_same_level(approvers):
user_name
=
user
.
name
user_name
=
user
.
name
return
user_name
return
user_name
return
None
return
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