Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
funkwhale
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
Reg
funkwhale
Commits
697ea24b
Verified
Commit
697ea24b
authored
Jun 24, 2018
by
Eliot Berriot
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
#302
: Include user's current private playlists on playlist list
parent
e068f4c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
api/funkwhale_api/common/fields.py
api/funkwhale_api/common/fields.py
+3
-3
api/funkwhale_api/playlists/views.py
api/funkwhale_api/playlists/views.py
+3
-1
api/tests/common/test_fields.py
api/tests/common/test_fields.py
+2
-1
changes/changelog.d/302.bugfix
changes/changelog.d/302.bugfix
+1
-0
No files found.
api/funkwhale_api/common/fields.py
View file @
697ea24b
...
...
@@ -17,13 +17,13 @@ def get_privacy_field():
)
def
privacy_level_query
(
user
,
lookup_field
=
"privacy_level"
):
def
privacy_level_query
(
user
,
lookup_field
=
"privacy_level"
,
user_field
=
"user"
):
if
user
.
is_anonymous
:
return
models
.
Q
(
**
{
lookup_field
:
"everyone"
})
return
models
.
Q
(
**
{
"{}__in"
.
format
(
lookup_field
):
[
"
followers"
,
"
instance"
,
"everyone"
]}
)
**
{
"{}__in"
.
format
(
lookup_field
):
[
"instance"
,
"everyone"
]}
)
|
models
.
Q
(
**
{
lookup_field
:
"me"
,
user_field
:
user
})
class
SearchFilter
(
django_filters
.
CharFilter
):
...
...
api/funkwhale_api/playlists/views.py
View file @
697ea24b
...
...
@@ -110,7 +110,9 @@ class PlaylistTrackViewSet(
def
get_queryset
(
self
):
return
self
.
queryset
.
filter
(
fields
.
privacy_level_query
(
self
.
request
.
user
,
lookup_field
=
"playlist__privacy_level"
self
.
request
.
user
,
lookup_field
=
"playlist__privacy_level"
,
user_field
=
"playlist__user"
,
)
)
...
...
api/tests/common/test_fields.py
View file @
697ea24b
...
...
@@ -12,7 +12,8 @@ from funkwhale_api.users.factories import UserFactory
(
AnonymousUser
(),
Q
(
privacy_level
=
"everyone"
)),
(
UserFactory
.
build
(
pk
=
1
),
Q
(
privacy_level__in
=
[
"followers"
,
"instance"
,
"everyone"
]),
Q
(
privacy_level__in
=
[
"instance"
,
"everyone"
])
|
Q
(
privacy_level
=
"me"
,
user
=
UserFactory
.
build
(
pk
=
1
)),
),
],
)
...
...
changes/changelog.d/302.bugfix
0 → 100644
View file @
697ea24b
Include user's current private playlists on playlist list (#302)
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