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

edit items

Browse source
This commit is contained in:
j 2011-10-24 20:48:14 +00:00
parent ea6092e35f
commit 78521648d5
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pandora/item/models.py
View file

@ -210,7 +210,7 @@ class Item(models.Model):
self.groups.add(group) self.groups.add(group)
for key in data: for key in data:
self.data[key] = data[key] self.data[key] = data[key]
self.save() return self.save()
def update_external(self): def update_external(self):
if settings.DATA_SERVICE and not self.itemId.startswith('0x'): if settings.DATA_SERVICE and not self.itemId.startswith('0x'):
@ -250,6 +250,7 @@ class Item(models.Model):
return '/%s' % self.itemId return '/%s' % self.itemId
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
update_poster = False
if not self.id: if not self.id:
if not self.itemId: if not self.itemId:
self.itemId = str(uuid.uuid1()) self.itemId = str(uuid.uuid1())
@ -267,7 +268,7 @@ class Item(models.Model):
q[0].merge_with(self, save=False) q[0].merge_with(self, save=False)
else: else:
self.oxdbId = oxdbId self.oxdbId = oxdbId
self.make_poster(True) update_poster = True
#id changed, what about existing item with new id? #id changed, what about existing item with new id?
if settings.USE_IMDB and len(self.itemId) != 7 and self.oxdbId != self.itemId: if settings.USE_IMDB and len(self.itemId) != 7 and self.oxdbId != self.itemId:
@ -283,7 +284,6 @@ class Item(models.Model):
self.update_find() self.update_find()
self.update_sort() self.update_sort()
self.update_facets() self.update_facets()
update_poster = False
if not settings.USE_IMDB: if not settings.USE_IMDB:
if self.poster_frame == -1 and self.sort.duration: if self.poster_frame == -1 and self.sort.duration:
self.poster_frame = self.sort.duration/2 self.poster_frame = self.sort.duration/2
@ -294,7 +294,8 @@ class Item(models.Model):
self.json = self.get_json() self.json = self.get_json()
super(Item, self).save(*args, **kwargs) super(Item, self).save(*args, **kwargs)
if update_poster: if update_poster:
tasks.update_poster.delay(self.itemId) return tasks.update_poster.delay(self.itemId)
return None
def delete_files(self): def delete_files(self):
path = os.path.join(settings.MEDIA_ROOT, self.path()) path = os.path.join(settings.MEDIA_ROOT, self.path())
@ -482,14 +483,14 @@ class Item(models.Model):
def update_find(self): def update_find(self):
def save(key, value): def save(key, value):
f, created = ItemFind.objects.get_or_create(item=self, key=key)
if value not in ('', None): if value not in ('', None):
f, created = ItemFind.objects.get_or_create(item=self, key=key)
if isinstance(value, basestring): if isinstance(value, basestring):
value = value.strip() value = value.strip()
f.value = value f.value = value
f.save() f.save()
else: else:
f.delete() ItemFind.objects.filter(item=self, key=key).delete()
for key in settings.CONFIG['itemKeys']: for key in settings.CONFIG['itemKeys']:
if key.get('find'): if key.get('find'):

4
pandora/item/views.py
View file

@ -448,7 +448,9 @@ def edit(request):
if 'rightsLevel' in data: if 'rightsLevel' in data:
item.level = data['rightsLevel'] item.level = data['rightsLevel']
del data['rightsLevel'] del data['rightsLevel']
item.edit(data) r = item.edit(data)
if r:
r.wait()
response['data'] = item.get_json() response['data'] = item.get_json()
else: else:
response = json_response(status=403, text='permissino denied') response = json_response(status=403, text='permissino denied')