Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
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
David Marzal
funkwhale
Commits
2a3f43ec
Verified
Commit
2a3f43ec
authored
7 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
Ensure privacy_level is settable/inherited properly
parent
859f8a05
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/funkwhale_api/playlists/views.py
+6
-1
6 additions, 1 deletion
api/funkwhale_api/playlists/views.py
api/tests/playlists/test_views.py
+24
-7
24 additions, 7 deletions
api/tests/playlists/test_views.py
with
30 additions
and
8 deletions
api/funkwhale_api/playlists/views.py
+
6
−
1
View file @
2a3f43ec
...
...
@@ -32,7 +32,12 @@ class PlaylistViewSet(
return
self
.
queryset
.
filter
(
user
=
self
.
request
.
user
)
def
perform_create
(
self
,
serializer
):
return
serializer
.
save
(
user
=
self
.
request
.
user
)
return
serializer
.
save
(
user
=
self
.
request
.
user
,
privacy_level
=
serializer
.
validated_data
.
get
(
'
privacy_level
'
,
self
.
request
.
user
.
privacy_level
)
)
class
PlaylistTrackViewSet
(
...
...
This diff is collapsed.
Click to expand it.
api/tests/playlists/test_views.py
+
24
−
7
View file @
2a3f43ec
...
...
@@ -7,27 +7,44 @@ from funkwhale_api.playlists import models
from
funkwhale_api.playlists.serializers
import
PlaylistSerializer
def
test_can_create_playlist_via_api
(
logged_in_client
):
def
test_can_create_playlist_via_api
(
logged_in_
api_
client
):
url
=
reverse
(
'
api:v1:playlists-list
'
)
data
=
{
'
name
'
:
'
test
'
,
'
privacy_level
'
:
'
everyone
'
}
response
=
logged_in_client
.
post
(
url
,
data
)
response
=
logged_in_
api_
client
.
post
(
url
,
data
)
playlist
=
logged_in_client
.
user
.
playlists
.
latest
(
'
id
'
)
playlist
=
logged_in_
api_
client
.
user
.
playlists
.
latest
(
'
id
'
)
assert
playlist
.
name
==
'
test
'
assert
playlist
.
privacy_level
==
'
everyone
'
def
test_can_add_playlist_track_via_api
(
factories
,
logged_in_client
):
def
test_playlist_inherits_user_privacy
(
logged_in_api_client
):
url
=
reverse
(
'
api:v1:playlists-list
'
)
user
=
logged_in_api_client
.
user
user
.
privacy_level
=
'
me
'
user
.
save
()
data
=
{
'
name
'
:
'
test
'
,
}
response
=
logged_in_api_client
.
post
(
url
,
data
)
playlist
=
user
.
playlists
.
latest
(
'
id
'
)
assert
playlist
.
privacy_level
==
user
.
privacy_level
def
test_can_add_playlist_track_via_api
(
factories
,
logged_in_api_client
):
tracks
=
factories
[
'
music.Track
'
].
create_batch
(
5
)
playlist
=
factories
[
'
playlists.Playlist
'
](
user
=
logged_in_client
.
user
)
playlist
=
factories
[
'
playlists.Playlist
'
](
user
=
logged_in_
api_
client
.
user
)
url
=
reverse
(
'
api:v1:playlist-tracks-list
'
)
data
=
{
'
playlist
'
:
playlist
.
pk
,
'
track
'
:
tracks
[
0
].
pk
}
response
=
logged_in_client
.
post
(
url
,
data
)
plts
=
logged_in_client
.
user
.
playlists
.
latest
(
'
id
'
).
playlist_tracks
.
all
()
response
=
logged_in_
api_
client
.
post
(
url
,
data
)
plts
=
logged_in_
api_
client
.
user
.
playlists
.
latest
(
'
id
'
).
playlist_tracks
.
all
()
assert
plts
.
first
().
track
==
tracks
[
0
]
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