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
b15873ec
Commit
b15873ec
authored
Feb 03, 2020
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{dev bugfix} added validation on update of user and application
parent
590ea23e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
18 deletions
+27
-18
app/applicationlayer/management/account/views.py
app/applicationlayer/management/account/views.py
+1
-0
app/applicationlayer/management/application/views.py
app/applicationlayer/management/application/views.py
+26
-18
No files found.
app/applicationlayer/management/account/views.py
View file @
b15873ec
...
...
@@ -175,6 +175,7 @@ class UserViewSet(viewsets.ModelViewSet):
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
@
rms
.
AccountValidation
@
rms
.
user_create
@
transaction
.
atomic
def
update
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
app/applicationlayer/management/application/views.py
View file @
b15873ec
...
...
@@ -13,6 +13,7 @@ from app.applicationlayer.utils import (
from
django_filters.rest_framework
import
DjangoFilterBackend
from
app.applicationlayer.management.application
import
serializer
from
app.applicationlayer.management.application.table_filters
import
ApplicationFilterSet
from
django.db
import
IntegrityError
class
ApplicationViewSet
(
viewsets
.
ModelViewSet
):
...
...
@@ -82,25 +83,32 @@ class ApplicationViewSet(viewsets.ModelViewSet):
return
Response
(
status
=
status
.
HTTP_204_NO_CONTENT
)
@
decorators
.
rms
.
ApplicationValidation
@
decorators
.
rms
.
application_crate
@
transaction
.
atomic
def
update
(
self
,
request
,
*
args
,
**
kwargs
):
try
:
partial
=
kwargs
.
pop
(
'partial'
,
False
)
instance
=
self
.
get_object
()
serializer
=
self
.
get_serializer
(
instance
,
data
=
request
.
data
,
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
old_instance
=
model_to_dict
(
instance
)
self
.
perform_update
(
serializer
)
new_instance
=
serializer
.
data
log_save
(
enums
.
LogEnum
.
UPDATE
.
value
,
enums
.
LogEntitiesEnum
.
APPLICATION
.
value
,
old_instance
[
'id'
],
old_instance
,
new_instance
)
partial
=
kwargs
.
pop
(
'partial'
,
False
)
instance
=
self
.
get_object
()
serializer
=
self
.
get_serializer
(
instance
,
data
=
request
.
data
,
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
old_instance
=
model_to_dict
(
instance
)
self
.
perform_update
(
serializer
)
new_instance
=
serializer
.
data
log_save
(
enums
.
LogEnum
.
UPDATE
.
value
,
enums
.
LogEntitiesEnum
.
APPLICATION
.
value
,
old_instance
[
'id'
],
old_instance
,
new_instance
)
return
Response
(
serializer
.
data
)
return
Response
(
serializer
.
data
)
except
IntegrityError
as
e
:
return
Response
(
{
"message"
:
"Cannot delete or update this reocrd it has foreign key constraint to other tables"
},
status
=
status
.
HTTP_400_BAD_REQUEST
)
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