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-10-26 14:52:48 +00:00
commit b494370bd0
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/annotation/models.py
View file

@ -107,8 +107,8 @@ class Annotation(models.Model):
def set_public_id(self): def set_public_id(self):
public_id = Annotation.objects.filter(item=self.item, id__lt=self.id).count() public_id = Annotation.objects.filter(item=self.item, id__lt=self.id).count()
self.public_id = "%s/%s" % ( self.item.itemId, ox.to26(public_id)) self.public_id = "%s/%s" % (self.item.itemId, ox.to26(public_id))
Annotation.objects.filter(id=self.id).update(public_id=public_id) Annotation.objects.filter(id=self.id).update(public_id=self.public_id)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.id: if not self.id:

4
pandora/archive/views.py
View file

@ -257,9 +257,9 @@ def moveFiles(request):
data['director'] = [] data['director'] = []
else: else:
data['director'] = data['director'].split(', ') data['director'] = data['director'].split(', ')
i = get_item(data) i = get_item(data, user=request.user)
else: else:
i = get_item({'imdbId': data['itemId']}) i = get_item({'imdbId': data['itemId']}, user=request.user)
changed = [i.itemId] changed = [i.itemId]
for f in models.File.objects.filter(oshash__in=data['ids']): for f in models.File.objects.filter(oshash__in=data['ids']):
if f.item.id != i.itemId and f.editable(request.user): if f.item.id != i.itemId and f.editable(request.user):

6
pandora/item/models.py
View file

@ -253,6 +253,8 @@ class Item(models.Model):
update_poster = False update_poster = False
update_ids = False update_ids = False
if not self.id: if not self.id:
if self.user:
self.level = settings.CONFIG['rightsLevel'][self.user.get_profile().get_level()]
if not self.itemId: if not self.itemId:
self.itemId = str(uuid.uuid1()) self.itemId = str(uuid.uuid1())
super(Item, self).save(*args, **kwargs) super(Item, self).save(*args, **kwargs)
@ -943,7 +945,9 @@ class Item(models.Model):
self.save() self.save()
elif os.path.exists(poster): elif os.path.exists(poster):
with open(poster) as f: with open(poster) as f:
self.poster.save('poster.jpg', ContentFile(f.read())) data = f.read()
if data:
self.poster.save('poster.jpg', ContentFile(data))
def make_siteposter(self): def make_siteposter(self):
poster = self.path('siteposter.jpg') poster = self.path('siteposter.jpg')