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

add entity/document relation

Browse source
This commit is contained in:
j 2015-02-13 11:06:09 +00:00
commit ccfaa7db4a
6 changed files with 235 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/annotation/models.py
View file

@ -13,7 +13,6 @@ from django.db.models.signals import pre_delete
import ox
from clip.models import Clip
from entity.models import Entity
from item.utils import sort_string, get_by_key
import managers
@ -205,6 +204,7 @@ class Annotation(models.Model):
e.delete()
def json(self, layer=False, keys=None, user=None):
from entity.models import Entity
j = {
'user': self.user.username,
}