decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

merge annotations

Browse source
This commit is contained in:
j 2011-01-04 01:57:40 +05:30
parent f82a18587f
commit a295981c77
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pandora/item/models.py
View file

@ -332,11 +332,10 @@ class Item(models.Model):
l.items.remove(self) l.items.remove(self)
if l.items.filter(id=other.id) == 0: if l.items.filter(id=other.id) == 0:
l.items.add(other) l.items.add(other)
#FIXME: should this really happen for layers? #FIXME: should this really happen for annotations?
for l in self.layer.all(): for a in self.annotations.all():
l.items.remove(self) a.item = other
if l.items.filter(id=other.id) == 0:
l.items.add(other)
if hasattr(self, 'files'): if hasattr(self, 'files'):
for f in self.files.all(): for f in self.files.all():
f.item = other f.item = other