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
7af56ac6
Commit
7af56ac6
authored
Jan 31, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
template header validations
parent
a92d24f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
16 deletions
+49
-16
app/applicationlayer/cms/template/header/serializers.py
app/applicationlayer/cms/template/header/serializers.py
+3
-3
app/applicationlayer/cms/template/header/views.py
app/applicationlayer/cms/template/header/views.py
+46
-13
No files found.
app/applicationlayer/cms/template/header/serializers.py
View file @
7af56ac6
...
...
@@ -33,7 +33,7 @@ class ChangeRequestTemplatesSerializer(
many
=
True
,
read_only
=
True
)
tmp_details
=
ChangeRequestTemplateDetailsSerializer
(
many
=
True
,
read_only
=
True
)
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
try
:
...
...
@@ -94,8 +94,8 @@ class ChangeRequestTemplatesSerializer(
'tmp_details'
)
read_only_fields
=
[
'created'
,
'template_no'
]
class
ChangeRequestTemplatesSerializerList
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/cms/template/header/views.py
View file @
7af56ac6
...
...
@@ -24,7 +24,8 @@ from app.applicationlayer.utils import log_save, CustomPagination
from
rest_framework.exceptions
import
ParseError
from
app.businesslayer.changerequest.change_request_template
import
(
tmp_add_edit_delete
,
validation_approver_same_level
validation_approver_same_level
,
validation_existing_vendor_requestor
)
from
app.applicationlayer.management.account.serializer
import
ChangeRequestList
from
app.applicationlayer.cms.template.approver.serializers
import
ChangeRequestTemplateApproversSerializer
...
...
@@ -345,18 +346,50 @@ class ChangeRequestTemplatePost(APIView):
template_header
=
request
.
data
try
:
# tmp_approvers = template_header['tmp_approvers']
# # Do not allow adding an approver for the same level
# validation_result = validation_approver_same_level(tmp_approvers)
# if validation_result is not None:
# message = {
# 'code': 400,
# 'status': 'failed',
# 'message': validation_result + ' is already existing for the same level of approval.',
# }
# return Response(message,
# status=status.HTTP_400_BAD_REQUEST)
# restrict superuser department
if
(
template_header
[
'created_by_department'
]
==
'DEPARTMENT-20190923-0000001'
or
template_header
[
'requested_to_department'
]
==
'DEPARTMENT-20190923-0000001'
):
message
=
{
'code'
:
400
,
'status'
:
'failed'
,
'message'
:
'Superuser department cannot be selected'
,
}
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
tmp_approvers
=
template_header
[
'tmp_approvers'
]
# Check if Vendor and Requestor are existing on routing table
if
len
(
tmp_approvers
)
<
2
:
message
=
{
'code'
:
400
,
'status'
:
'failed'
,
'message'
:
'Please make sure to add an Approver, Vendor and Requestor into routing table'
,
}
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
else
:
result
=
validation_existing_vendor_requestor
(
tmp_approvers
)
if
result
is
False
:
message
=
{
'code'
:
400
,
'status'
:
'failed'
,
'message'
:
'Please add Vendor/Implementor and Requestor into routing table'
,
}
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
# Do not allow adding an approver for the same level
validation_result
=
validation_approver_same_level
(
tmp_approvers
)
if
validation_result
is
not
None
:
message
=
{
'code'
:
400
,
'status'
:
'failed'
,
'message'
:
validation_result
+
' is already existing for the same level of approval.'
,
}
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
data_list_approver
=
[]
data_list_stake
=
[]
...
...
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