From: david <> Date: Tue, 22 Sep 2009 14:20:28 +0000 (+0000) Subject: #74: Fix relation names, class two times enumerated (EthnicGroup)and relations X-Git-Tag: 1.1~631 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a803d500e73ce901ca801c42a92a31b8b74403e6;p=telemeta.git #74: Fix relation names, class two times enumerated (EthnicGroup)and relations --- diff --git a/telemeta/models/crem.py b/telemeta/models/crem.py index 9f3ea99b..da449b22 100755 --- a/telemeta/models/crem.py +++ b/telemeta/models/crem.py @@ -16,7 +16,7 @@ class MediaCollection(models.Model): booklet_description = models.TextField() collector = models.CharField(max_length=250) collector_is_creator = models.BooleanField() - publisher_id = models.IntegerField() + publisher_id = models.ForeignKey('Publishers', related_name="collections") year_published = models.IntegerField() publisher_collection = models.ForeignKey('PublisherCollection', related_name="collections") publisher_serial = models.CharField(max_length=250) @@ -103,9 +103,6 @@ class RecordingContext(models.Model): class AdConversion(models.Model): value = models.CharField(max_length=250) -class EthnicGroup(models.Model): - value = models.CharField(max_length=250) - class VernacularStyle(models.Model): value = models.CharField(max_length=250) @@ -186,7 +183,7 @@ class Revision(models.Model): CHANGE_TYPE_CHOICES = (('0', 'create'), ('1', 'update'), ('2','delete')) element_type = models.CharField(max_length=250) - element = models.ForeignKey('User', related_name="elements") + element_id = models.IntegerField() change_type = models.CharField(choices=CHANGE_TYPE_CHOICES, max_length=250) time = models.DateTimeField() username = models.ForeignKey('User', related_name="usernames")