From f2eacf6125253ac028d19b3f5a3e5320d7285b73 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 27 Jul 2012 23:28:49 +0000 Subject: [PATCH] Remove tag complexity: tags are not ordered svn: r20121 --- src/webapp/grampsdb/models.py | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/webapp/grampsdb/models.py b/src/webapp/grampsdb/models.py index 0bc17cb8a..29252eded 100644 --- a/src/webapp/grampsdb/models.py +++ b/src/webapp/grampsdb/models.py @@ -469,26 +469,6 @@ class PersonParentFamilyOrder(models.Model): family = models.ForeignKey("Family") 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): """ The model for the person object @@ -510,7 +490,7 @@ class Person(PrimaryObject): birth_ref_index = models.IntegerField("Birth 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: # .name_set @@ -539,7 +519,7 @@ class Family(PrimaryObject): mother = models.ForeignKey('Person', related_name="mother_ref", null=True, blank=True) 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): return tuple() @@ -634,7 +614,7 @@ class Media(DateObject, PrimaryObject): references = generic.GenericRelation('MediaRef', related_name="refs", content_type_field="object_type", 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): return tuple() @@ -649,7 +629,7 @@ class Note(PrimaryObject): references = generic.GenericRelation('NoteRef', related_name="refs", content_type_field="object_type", 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): return tuple()