Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove tag complexity: tags are not ordered

Browse Source 
svn: r20121
This commit is contained in:
Doug Blank 2012-07-27 23:28:49 +00:00
parent bcfdeecdab
commit f2eacf6125
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/webapp/grampsdb/models.py
View File

@ -469,26 +469,6 @@ class PersonParentFamilyOrder(models.Model):
family = models.ForeignKey("Family") family = models.ForeignKey("Family")
order = models.PositiveIntegerField(default=1) order = models.PositiveIntegerField(default=1)
class PersonTag(models.Model):
person = models.ForeignKey("Person")
tag = models.ForeignKey("Tag")
order = models.PositiveIntegerField(default=1)
class FamilyTag(models.Model):
family = models.ForeignKey("Family")
tag = models.ForeignKey("Tag")
order = models.PositiveIntegerField(default=1)
class MediaTag(models.Model):
media = models.ForeignKey("Media")
tag = models.ForeignKey("Tag")
order = models.PositiveIntegerField(default=1)
class NoteTag(models.Model):
note = models.ForeignKey("Note")
tag = models.ForeignKey("Tag")
order = models.PositiveIntegerField(default=1)
class Person(PrimaryObject): class Person(PrimaryObject):
""" """
The model for the person object The model for the person object
@ -510,7 +490,7 @@ class Person(PrimaryObject):
birth_ref_index = models.IntegerField("Birth Reference Index", default=-1) birth_ref_index = models.IntegerField("Birth Reference Index", default=-1)
death_ref_index = models.IntegerField("Death Reference Index", default=-1) death_ref_index = models.IntegerField("Death Reference Index", default=-1)
tags = models.ManyToManyField('Tag', blank=True, null=True, through="PersonTag") tags = models.ManyToManyField('Tag', blank=True, null=True)
# Others keys here: # Others keys here:
# .name_set # .name_set
@ -539,7 +519,7 @@ class Family(PrimaryObject):
mother = models.ForeignKey('Person', related_name="mother_ref", mother = models.ForeignKey('Person', related_name="mother_ref",
null=True, blank=True) null=True, blank=True)
family_rel_type = models.ForeignKey('FamilyRelType', verbose_name="Type") family_rel_type = models.ForeignKey('FamilyRelType', verbose_name="Type")
tags = models.ManyToManyField('Tag', blank=True, null=True, through="FamilyTag") tags = models.ManyToManyField('Tag', blank=True, null=True)
def make_tag_list(self): def make_tag_list(self):
return tuple() return tuple()
@ -634,7 +614,7 @@ class Media(DateObject, PrimaryObject):
references = generic.GenericRelation('MediaRef', related_name="refs", references = generic.GenericRelation('MediaRef', related_name="refs",
content_type_field="object_type", content_type_field="object_type",
object_id_field="object_id") object_id_field="object_id")
tags = models.ManyToManyField('Tag', blank=True, null=True, through="MediaTag") tags = models.ManyToManyField('Tag', blank=True, null=True)
def make_tag_list(self): def make_tag_list(self):
return tuple() return tuple()
@ -649,7 +629,7 @@ class Note(PrimaryObject):
references = generic.GenericRelation('NoteRef', related_name="refs", references = generic.GenericRelation('NoteRef', related_name="refs",
content_type_field="object_type", content_type_field="object_type",
object_id_field="object_id") object_id_field="object_id")
tags = models.ManyToManyField('Tag', blank=True, null=True, through="NoteTag") tags = models.ManyToManyField('Tag', blank=True, null=True)
def make_tag_list(self): def make_tag_list(self):
return tuple() return tuple()