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
7d981021
Commit
7d981021
authored
Mar 17, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{devbugfix} delete old asset group
parent
25fb7231
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
41 deletions
+28
-41
app/applicationlayer/ams/asset_type/serializers.py
app/applicationlayer/ams/asset_type/serializers.py
+1
-1
app/applicationlayer/ams/asset_type/views.py
app/applicationlayer/ams/asset_type/views.py
+11
-9
app/entities/migrations/0008_delete_assetgroup.py
app/entities/migrations/0008_delete_assetgroup.py
+16
-0
app/entities/models.py
app/entities/models.py
+0
-31
No files found.
app/applicationlayer/ams/asset_type/serializers.py
View file @
7d981021
...
...
@@ -8,4 +8,4 @@ class AssetTypeSerializer(serializers.ModelSerializer):
class
Meta
:
model
=
models
.
AMSAssetType
fields
=
'__all__'
read_only_fields
=
[
'created'
,
'code'
]
\ No newline at end of file
read_only_fields
=
[
'created'
,
'created_by'
,
'code'
]
\ No newline at end of file
app/applicationlayer/ams/asset_type/views.py
View file @
7d981021
...
...
@@ -29,17 +29,19 @@ class AssetTypeViewset(viewsets.ModelViewSet):
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
serializer
=
self
.
get_serializer
(
data
=
request
.
data
)
serializer
.
is_valid
(
raise_exception
=
True
)
self
.
perform_create
(
serializer
)
# serializer.is_valid(raise_exception=True)
if
serializer
.
is_valid
(
raise_exception
=
True
):
serializer
.
save
(
created_by
=
self
.
request
.
user
)
self
.
perform_create
(
serializer
)
message
=
status_message_response
(
201
,
'success'
,
'New Asset Type created'
,
serializer
.
data
)
message
=
status_message_response
(
201
,
'success'
,
'New Asset Type created'
,
serializer
.
data
)
return
Response
(
message
)
return
Response
(
message
)
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
app/entities/migrations/0008_delete_assetgroup.py
0 → 100644
View file @
7d981021
# Generated by Django 2.2 on 2020-03-17 10:12
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'entities'
,
'0007_auto_20200317_1005'
),
]
operations
=
[
migrations
.
DeleteModel
(
name
=
'AssetGroup'
,
),
]
app/entities/models.py
View file @
7d981021
...
...
@@ -1246,37 +1246,6 @@ class ChangeRequestSettings(models.Model):
**********************
"""
class
AssetGroup
(
models
.
Model
):
code
=
models
.
CharField
(
unique
=
True
,
max_length
=
255
)
name
=
models
.
CharField
(
unique
=
True
,
max_length
=
255
)
asset_group
=
models
.
CharField
(
unique
=
True
,
max_length
=
255
)
created
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
db_table
=
'asset_groups'
ordering
=
[
'-created'
]
def
__str__
(
self
):
return
f
'{self.code}'
def
save
(
self
,
*
args
,
**
kwargs
):
super
(
AssetGroup
,
self
)
.
save
(
*
args
,
**
kwargs
)
code
=
number_generator
(
enums
.
GenerateCode
.
ASSET_GROUP
.
value
,
self
.
id
)
if
self
.
code
==
''
:
self
.
code
=
code
self
.
created
=
datetime
.
now
()
self
.
save
()
class
AMSPrivilege
(
models
.
Model
):
id_number
=
models
.
ForeignKey
(
User
,
...
...
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