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

rename series, canplayvideo, canplayclips

Browse source
This commit is contained in:
rolux 2011-11-10 14:59:12 +00:00
commit fdc29212b7
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pandora/item/managers.py
View file

@ -63,9 +63,12 @@ def parseCondition(condition, user):
if exclude:
q = ~q
return q
elif k in ('canPlayVideo', 'canPlayClips'):
elif k in ('canplayvideo', 'canplayclips'):
level = user.is_anonymous() and 'guest' or user.get_profile().get_level()
allowed_level = settings.CONFIG['capabilities'][k][level]
allowed_level = settings.CONFIG['capabilities'][{
'canplayvideo': 'canPlayVideo',
'canplayclips': 'canPlayClips'
}[k]][level]
if v:
q = Q(level__lte=allowed_level)
else:
@ -74,7 +77,7 @@ def parseCondition(condition, user):
q = ~q
return q
elif key_type == 'boolean':
q = Q(**{'find__key': k, 'find__value': v and '1' or '0'})
q = Q(**{'find__key': k, 'find__value': v})
if exclude:
q = ~q
return q

4
pandora/item/models.py
View file

@ -514,7 +514,7 @@ class Item(models.Model):
if value not in ('', None):
f, created = ItemFind.objects.get_or_create(item=self, key=key)
if isinstance(value, bool):
value = value and '1' or '0'
value = value and 'true' or 'false'
if isinstance(value, basestring):
value = value.strip()
f.value = value
@ -567,7 +567,7 @@ class Item(models.Model):
self.get('episodeTitle',
self.get('episode',
self.get('seriesTitle')))) != None
save('isSeries', isSeries)
save('series', isSeries)
def update_sort(self):
try: