#74: Fix relation names, class two times enumerated (EthnicGroup)and relations

diff --git a/telemeta/models/crem.py b/telemeta/models/crem.py
index 9f3ea99bc8106e08a8a2c2425d8d38e4c3dda158..da449b227190fd42ed815817f8adf24ef8b93276 100755 (executable)
--- 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")