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
1e780140
Commit
1e780140
authored
Feb 03, 2020
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{dev bugfix} added validation on Application section set excel_code not blank, unique and required
parent
46c4cce0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
1 deletion
+26
-1
app/applicationlayer/management/application/views.py
app/applicationlayer/management/application/views.py
+1
-0
app/helper/decorators.py
app/helper/decorators.py
+25
-1
No files found.
app/applicationlayer/management/application/views.py
View file @
1e780140
...
@@ -26,6 +26,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
...
@@ -26,6 +26,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
search_fields
=
(
'name'
,
'code'
)
search_fields
=
(
'name'
,
'code'
)
@
decorators
.
rms
.
ApplicationValidation
@
decorators
.
rms
.
application_crate
@
decorators
.
rms
.
application_crate
@
transaction
.
atomic
@
transaction
.
atomic
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
app/helper/decorators.py
View file @
1e780140
...
@@ -47,7 +47,7 @@ class rms:
...
@@ -47,7 +47,7 @@ class rms:
enums_company
=
enums
.
UserTypeEnum
.
COMPANY_USER_ADMIN
.
value
enums_company
=
enums
.
UserTypeEnum
.
COMPANY_USER_ADMIN
.
value
enums_department
=
enums
.
UserTypeEnum
.
DEPARTMENT_USER_ADMIN
.
value
enums_department
=
enums
.
UserTypeEnum
.
DEPARTMENT_USER_ADMIN
.
value
enums_user
=
enums
.
UserTypeEnum
.
USER
.
value
enums_user
=
enums
.
UserTypeEnum
.
USER
.
value
access_error
=
"Logged user is unauthorize to
make another user
"
access_error
=
"Logged user is unauthorize to
access this section
"
department_error
=
'Department should be same with the logged user'
department_error
=
'Department should be same with the logged user'
company_error
=
'Company should be same with the logged user'
company_error
=
'Company should be same with the logged user'
...
@@ -97,6 +97,30 @@ class rms:
...
@@ -97,6 +97,30 @@ class rms:
return
wrapper
return
wrapper
@
staticmethod
def
ApplicationValidation
(
function
):
@
wraps
(
function
)
def
wrapper
(
self
,
request
,
*
args
,
**
kwargs
):
payload
=
request
.
data
if
not
'excel_code'
in
payload
:
return
Response
(
{
"message"
:
"Excel code is required"
}
)
elif
len
(
payload
[
'excel_code'
]
.
strip
())
==
0
:
return
Response
(
{
"message"
:
"Excel code is may not be blank"
}
)
is_excel_code_exist
=
self
.
queryset
.
filter
(
excel_code
=
payload
[
'excel_code'
]
)
if
is_excel_code_exist
:
return
Response
(
{
"message"
:
"This excel code is already exists"
}
)
return
function
(
self
,
request
,
*
args
,
**
kwargs
)
return
wrapper
@
staticmethod
@
staticmethod
def
AccountValidation
(
function
):
def
AccountValidation
(
function
):
@
wraps
(
function
)
@
wraps
(
function
)
...
...
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