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

merge

Browse source
This commit is contained in:
rolux 2011-11-07 17:53:27 +00:00
commit 2e8fb609bf
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/clip/models.py
View file

@ -11,7 +11,9 @@ import managers
class MetaClip: class MetaClip:
def update_calculated_values(self): def update_calculated_values(self):
self.duration = self.end - self.start start = min(self.start, self.item.sort.duration)
end = min(self.end, self.item.sort.duration)
self.duration = end - start
if self.duration > 0: if self.duration > 0:
self.hue, self.saturation, self.lightness = extract.average_color( self.hue, self.saturation, self.lightness = extract.average_color(
self.item.timeline_prefix, self.start, self.end) self.item.timeline_prefix, self.start, self.end)

4
pandora/user/models.py
View file

@ -23,6 +23,7 @@ class SessionData(models.Model):
firstseen = models.DateTimeField(auto_now_add=True, db_index=True) firstseen = models.DateTimeField(auto_now_add=True, db_index=True)
lastseen = models.DateTimeField(auto_now=True, db_index=True) lastseen = models.DateTimeField(auto_now=True, db_index=True)
username = models.CharField(max_length=255, null=True, db_index=True) username = models.CharField(max_length=255, null=True, db_index=True)
level = models.IntegerField(default=0)
timesseen = models.IntegerField(default=0) timesseen = models.IntegerField(default=0)
ip = models.CharField(default='', max_length=255) ip = models.CharField(default='', max_length=255)
@ -40,7 +41,10 @@ class SessionData(models.Model):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if self.user: if self.user:
self.username = self.user.username self.username = self.user.username
self.level = self.user.get_profile().level
self.firstseen = self.user.date_joined self.firstseen = self.user.date_joined
else:
self.level = 0
super(SessionData, self).save(*args, **kwargs) super(SessionData, self).save(*args, **kwargs)
@classmethod @classmethod

1
pandora/user/views.py
View file

@ -422,6 +422,7 @@ def order_query(qs, sort):
'useragent': 'useragent', 'useragent': 'useragent',
'username': 'username', 'username': 'username',
'windowsize': 'windowsize', 'windowsize': 'windowsize',
'level': 'level',
}.get(e['key'], 'user__profile__%s'%e['key']) }.get(e['key'], 'user__profile__%s'%e['key'])
if key == 'user__profile__numberoflists': if key == 'user__profile__numberoflists':
qs = qs.annotate(numberoflists=Sum('user__lists')) qs = qs.annotate(numberoflists=Sum('user__lists'))