Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
djangoldp
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
djangoldp-packages
djangoldp
Commits
b2c492f0
Commit
b2c492f0
authored
6 years ago
by
Jean-Baptiste
Browse files
Options
Downloads
Patches
Plain Diff
bugfix: auto_author should not be removed on GET
parent
e6dc204c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!48
bugfix: auto_author should not be removed on GET
Pipeline
#855
passed
6 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
djangoldp/serializers.py
+11
-10
11 additions, 10 deletions
djangoldp/serializers.py
with
11 additions
and
10 deletions
djangoldp/serializers.py
+
11
−
10
View file @
b2c492f0
...
@@ -17,7 +17,6 @@ from rest_framework.utils import model_meta
...
@@ -17,7 +17,6 @@ from rest_framework.utils import model_meta
from
rest_framework.utils.field_mapping
import
get_nested_relation_kwargs
from
rest_framework.utils.field_mapping
import
get_nested_relation_kwargs
from
rest_framework.utils.serializer_helpers
import
ReturnDict
from
rest_framework.utils.serializer_helpers
import
ReturnDict
from
djangoldp
import
permissions
from
djangoldp.fields
import
LDPUrlField
,
IdURLField
from
djangoldp.fields
import
LDPUrlField
,
IdURLField
from
djangoldp.models
import
Model
from
djangoldp.models
import
Model
...
@@ -196,12 +195,13 @@ class LDPSerializer(HyperlinkedModelSerializer):
...
@@ -196,12 +195,13 @@ class LDPSerializer(HyperlinkedModelSerializer):
fields
=
list
(
self
.
Meta
.
model
.
_meta
.
serializer_fields
)
fields
=
list
(
self
.
Meta
.
model
.
_meta
.
serializer_fields
)
except
AttributeError
:
except
AttributeError
:
fields
=
super
().
get_default_field_names
(
declared_fields
,
model_info
)
fields
=
super
().
get_default_field_names
(
declared_fields
,
model_info
)
try
:
if
'
request
'
in
self
.
_context
and
not
self
.
_context
[
'
request
'
].
_request
.
method
==
'
GET
'
:
fields
.
remove
(
self
.
Meta
.
model
.
_meta
.
auto_author
)
try
:
except
ValueError
:
fields
.
remove
(
self
.
Meta
.
model
.
_meta
.
auto_author
)
pass
except
ValueError
:
except
AttributeError
:
pass
pass
except
AttributeError
:
pass
return
fields
+
list
(
getattr
(
self
.
Meta
,
'
extra_fields
'
,
[]))
return
fields
+
list
(
getattr
(
self
.
Meta
,
'
extra_fields
'
,
[]))
def
get_permissions
(
self
,
obj
):
def
get_permissions
(
self
,
obj
):
...
@@ -221,9 +221,9 @@ class LDPSerializer(HyperlinkedModelSerializer):
...
@@ -221,9 +221,9 @@ class LDPSerializer(HyperlinkedModelSerializer):
data
[
'
@type
'
]
=
obj
.
_meta
.
rdf_type
data
[
'
@type
'
]
=
obj
.
_meta
.
rdf_type
if
hasattr
(
obj
.
_meta
,
'
rdf_context
'
):
if
hasattr
(
obj
.
_meta
,
'
rdf_context
'
):
data
[
'
@context
'
]
=
obj
.
_meta
.
rdf_context
data
[
'
@context
'
]
=
obj
.
_meta
.
rdf_context
data
[
'
permissions
'
]
=
self
.
get_permissions
(
obj
)
data
[
'
permissions
'
]
=
self
.
get_permissions
(
obj
)
return
data
return
data
def
build_field
(
self
,
field_name
,
info
,
model_class
,
nested_depth
):
def
build_field
(
self
,
field_name
,
info
,
model_class
,
nested_depth
):
...
@@ -387,7 +387,8 @@ class LDPSerializer(HyperlinkedModelSerializer):
...
@@ -387,7 +387,8 @@ class LDPSerializer(HyperlinkedModelSerializer):
info
=
model_meta
.
get_field_info
(
model_class
)
info
=
model_meta
.
get_field_info
(
model_class
)
many_to_many
=
{}
many_to_many
=
{}
for
field_name
,
relation_info
in
info
.
relations
.
items
():
for
field_name
,
relation_info
in
info
.
relations
.
items
():
if
relation_info
.
to_many
and
relation_info
.
reverse
and
not
(
field_name
in
validated_data
)
and
not
field_name
is
None
:
if
relation_info
.
to_many
and
relation_info
.
reverse
and
not
(
field_name
in
validated_data
)
and
not
field_name
is
None
:
rel
=
getattr
(
instance
.
_meta
.
model
,
field_name
).
rel
rel
=
getattr
(
instance
.
_meta
.
model
,
field_name
).
rel
if
rel
.
name
in
validated_data
:
if
rel
.
name
in
validated_data
:
related
=
validated_data
[
rel
.
name
]
related
=
validated_data
[
rel
.
name
]
...
...
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