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
ec799e00
Commit
ec799e00
authored
Feb 05, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{dev bugfix} validation save submit
parent
304a5db4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
11 deletions
+10
-11
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+2
-2
app/applicationlayer/cms/template/header/views.py
app/applicationlayer/cms/template/header/views.py
+8
-1
app/helper/decorators.py
app/helper/decorators.py
+0
-8
No files found.
app/applicationlayer/cms/form/header/views.py
View file @
ec799e00
...
@@ -752,7 +752,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -752,7 +752,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
return
Response
(
message
,
status
=
status
.
HTTP_200_OK
)
return
Response
(
message
,
status
=
status
.
HTTP_200_OK
)
#
@FormValidation
@
FormValidation
@
transaction
.
atomic
@
transaction
.
atomic
@
action
(
@
action
(
methods
=
[
'PATCH'
],
detail
=
True
,
methods
=
[
'PATCH'
],
detail
=
True
,
...
@@ -866,7 +866,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
...
@@ -866,7 +866,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
return
Response
(
message
,
status
=
status
.
HTTP_200_OK
)
return
Response
(
message
,
status
=
status
.
HTTP_200_OK
)
#
@FormValidation
@
FormValidation
@
transaction
.
atomic
@
transaction
.
atomic
@
action
(
@
action
(
methods
=
[
'PATCH'
],
detail
=
True
,
methods
=
[
'PATCH'
],
detail
=
True
,
...
...
app/applicationlayer/cms/template/header/views.py
View file @
ec799e00
...
@@ -348,8 +348,15 @@ class ChangeRequestTemplatePost(APIView):
...
@@ -348,8 +348,15 @@ class ChangeRequestTemplatePost(APIView):
@
transaction
.
atomic
()
@
transaction
.
atomic
()
def
post
(
self
,
request
):
def
post
(
self
,
request
):
template_header
=
request
.
data
template_header
=
request
.
data
try
:
try
:
# Check if prefix already exists
prefix
=
models
.
ChangeRequestTemplateHeader
.
objects
.
filter
(
requested_to_template_id
=
template_header
[
'requested_to_template_id'
])
if
prefix
:
return
error_message
(
'400'
,
'CR Number prefix already exists.'
,
'failed'
,
status
.
HTTP_400_BAD_REQUEST
)
data_list_approver
=
[]
data_list_approver
=
[]
data_list_stake
=
[]
data_list_stake
=
[]
data_list_attach
=
[]
data_list_attach
=
[]
...
...
app/helper/decorators.py
View file @
ec799e00
...
@@ -308,14 +308,6 @@ def TemplateValidation(function):
...
@@ -308,14 +308,6 @@ def TemplateValidation(function):
return
error_message
(
'400'
,
required
[
key
]
+
' is required'
,
return
error_message
(
'400'
,
required
[
key
]
+
' is required'
,
'failed'
,
status
.
HTTP_400_BAD_REQUEST
)
'failed'
,
status
.
HTTP_400_BAD_REQUEST
)
# Check if prefix already exists
# prefix = ChangeRequestTemplateHeader.objects.filter(
# requested_to_template_id=template_header['requested_to_template_id'])
# if prefix:
# return error_message('400', 'CR Number prefix already exists.',
# 'failed', status.HTTP_400_BAD_REQUEST)
# Restrict form using Superuser Department
# Restrict form using Superuser Department
if
(
template_header
[
'created_by_department'
]
==
'DEPARTMENT-20190923-0000001'
or
if
(
template_header
[
'created_by_department'
]
==
'DEPARTMENT-20190923-0000001'
or
template_header
[
'requested_to_department'
]
==
'DEPARTMENT-20190923-0000001'
):
template_header
[
'requested_to_department'
]
==
'DEPARTMENT-20190923-0000001'
):
...
...
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