0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:4d2dff3afc5cb7d1fdb3b607fa873cff1cfc4bc2
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:5168ed4a33b38d5fc1441a02831d870ca8e37ade
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "4d2dff3afc5cb7d1fdb3b607fa873cff1cfc4bc2" and "5168ed4a33b38d5fc1441a02831d870ca8e37ade" have entirely different histories.
4d2dff3afc ... 5168ed4a33

2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/config.pandora.jsonc
View file

@ -1274,6 +1274,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"formats": ["webm", "mp4"], "formats": ["webm", "mp4"],
"previewRatio": 1.3333333333, "previewRatio": 1.3333333333,
"resolutions": [240, 480], "resolutions": [240, 480],
"torrent": false "torrent": true
} }
} }

3
pandora/item/managers.py
View file

@ -165,9 +165,6 @@ def parseCondition(condition, user, owner=None):
else: else:
q = Q(id__in=l.items.all()) q = Q(id__in=l.items.all())
if exclude: if exclude:
if isinstance(q, list):
q = [~x for x in q]
else:
q = ~q q = ~q
else: else:
q = Q(id=0) q = Q(id=0)