Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Rex Dri
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Jerphanion
Rex Dri
Commits
2d9acbbf
Commit
2d9acbbf
authored
6 years ago
by
Florent Chehab
Browse files
Options
Downloads
Patches
Plain Diff
API tweaks
parent
c8583636
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
rex/models/localization/localization.py
+21
-5
21 additions, 5 deletions
rex/models/localization/localization.py
with
21 additions
and
5 deletions
rex/models/localization/localization.py
+
21
−
5
View file @
2d9acbbf
...
...
@@ -88,7 +88,23 @@ class CountrySerializer(serializers.ModelSerializer):
'
region
'
,
'
regions
'
)
class
CountryViewSet
(
viewsets
.
ModelViewSet
):
class
DictModeViewSet
(
viewsets
.
ModelViewSet
):
"""
ViewSet that renders data as dict with keys corresponding to the model
primary key. Instead of list.
"""
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
response
=
super
(
viewsets
.
ModelViewSet
,
self
).
list
(
request
,
*
args
,
**
kwargs
)
# call the original 'list'
pk_attr_name
=
self
.
serializer_class
.
Meta
.
model
.
_meta
.
pk
.
name
response
.
data
=
{
d
[
pk_attr_name
]:
d
for
d
in
response
.
data
}
return
response
class
CountryViewSet
(
DictModeViewSet
):
permission_classes
=
(
permissions
.
DjangoModelPermissions
,)
queryset
=
Country
.
objects
.
all
()
# noqa: E1101
serializer_class
=
CountrySerializer
...
...
@@ -116,7 +132,7 @@ class RegionSerializer(serializers.ModelSerializer):
fields
=
(
'
name
'
,
'
un_code
'
,
'
parent
'
,
'
parent_url
'
,
'
region_type
'
)
class
RegionViewSet
(
viewsets
.
Mode
l
ViewSet
):
class
RegionViewSet
(
Dict
ModeViewSet
):
permission_classes
=
(
permissions
.
DjangoModelPermissions
,)
queryset
=
Region
.
objects
.
all
()
# noqa: E1101
serializer_class
=
RegionSerializer
...
...
@@ -129,15 +145,15 @@ class CitySerializer(serializers.ModelSerializer):
return
serializers
.
HyperlinkedRelatedField
(
view_name
=
'
country-detail
'
,
read_only
=
True
)
\
.
get_url
(
obj
.
country
,
view_name
=
'
region
-detail
'
,
.
get_url
(
obj
.
country
,
view_name
=
'
country
-detail
'
,
request
=
self
.
context
[
'
request
'
],
format
=
None
)
class
Meta
:
model
=
City
fields
=
(
'
name
'
,
'
local_name
'
,
'
area
'
,
'
country
'
,
'
country_url
'
)
fields
=
(
'
name
'
,
'
local_name
'
,
'
area
'
,
'
country
'
,
'
country_url
'
,
'
id
'
)
class
CityViewSet
(
viewsets
.
Mode
l
ViewSet
):
class
CityViewSet
(
Dict
ModeViewSet
):
permission_classes
=
(
permissions
.
DjangoModelPermissions
,)
queryset
=
City
.
objects
.
all
()
# noqa: E1101
serializer_class
=
CitySerializer
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment