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

merging changes

Browse source
This commit is contained in:
rolux 2011-10-03 00:11:12 +00:00
commit edb20ee2ce
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandora/clip/models.py
View file

@ -5,8 +5,6 @@ from __future__ import division, with_statement
from django.db import models from django.db import models
from django.conf import settings from django.conf import settings
import ox
from archive import extract from archive import extract
import managers import managers
@ -50,9 +48,6 @@ class Clip(models.Model):
self.update_calculated_values() self.update_calculated_values()
super(Clip, self).save(*args, **kwargs) super(Clip, self).save(*args, **kwargs)
def set_public_id(self):
self.public_id = u"%s/%s-%s" %(self.item.itemId, self.start, self.end)
def json(self, keys=None): def json(self, keys=None):
j = {} j = {}
for field in ('id', 'in', 'out', 'created', 'modified', for field in ('id', 'in', 'out', 'created', 'modified',