From: Guillaume Pellerin Date: Thu, 19 Dec 2013 11:12:03 +0000 (+0100) Subject: no notes but chat X-Git-Tag: 1.4.5~2^2~10 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d765b69e792a84e96ec0dc9f463b59657d914570;p=telemeta.git no notes but chat --- diff --git a/telemeta/models/enum.py b/telemeta/models/enum.py index d65e1959..fcc65180 100644 --- a/telemeta/models/enum.py +++ b/telemeta/models/enum.py @@ -36,7 +36,6 @@ from telemeta.models.core import * from django.utils.translation import ugettext_lazy as _ from django.contrib.contenttypes import generic -from notes.models import Note class Enumeration(ModelCore): @@ -55,8 +54,6 @@ class MetaEnumeration(MetaCore): class PhysicalFormat(Enumeration): "Collection physical format" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'physical_formats' verbose_name = _("archive format") @@ -64,8 +61,6 @@ class PhysicalFormat(Enumeration): class PublishingStatus(Enumeration): "Collection publishing status" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'publishing_status' verbose_name = _("secondary edition") @@ -73,16 +68,13 @@ class PublishingStatus(Enumeration): class AcquisitionMode(Enumeration): "Mode of acquisition of the collection" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'acquisition_modes' verbose_name = _("mode of acquisition") class MetadataAuthor(Enumeration): "Collection metadata author" - - notes = generic.GenericRelation(Note) + class Meta(MetaEnumeration): db_table = 'metadata_authors' @@ -91,8 +83,6 @@ class MetadataAuthor(Enumeration): class MetadataWriter(Enumeration): "Collection metadata writer" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'metadata_writers' verbose_name = _("record writer") @@ -100,8 +90,6 @@ class MetadataWriter(Enumeration): class LegalRight(Enumeration): "Collection legal rights" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'legal_rights' verbose_name = _("legal rights") @@ -109,8 +97,6 @@ class LegalRight(Enumeration): class RecordingContext(Enumeration): "Collection recording context" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'recording_contexts' verbose_name = _("recording context") @@ -118,8 +104,6 @@ class RecordingContext(Enumeration): class AdConversion(Enumeration): "Collection digital to analog conversion status" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'ad_conversions' verbose_name = _("A/D conversion") @@ -127,8 +111,6 @@ class AdConversion(Enumeration): class VernacularStyle(Enumeration): "Item vernacular style" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'vernacular_styles' verbose_name = _("vernacular style") @@ -136,8 +118,6 @@ class VernacularStyle(Enumeration): class GenericStyle(Enumeration): "Item generic style" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'generic_styles' verbose_name = _("generic style") @@ -145,8 +125,6 @@ class GenericStyle(Enumeration): class ContextKeyword(Enumeration): "Keyword" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'context_keywords' verbose_name = _("keyword") @@ -154,8 +132,6 @@ class ContextKeyword(Enumeration): class Publisher(Enumeration): "Collection publisher" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'publishers' verbose_name = _("publisher / status") @@ -166,8 +142,7 @@ class PublisherCollection(ModelCore): publisher = ForeignKey('Publisher', related_name="publisher_collections", verbose_name=_('publisher')) value = CharField(_('value'), required=True) - notes = generic.GenericRelation(Note) - + def __unicode__(self): return self.value @@ -179,8 +154,6 @@ class PublisherCollection(ModelCore): class EthnicGroup(Enumeration): "Item ethnic group" - notes = generic.GenericRelation(Note) - class Meta(MetaEnumeration): db_table = 'ethnic_groups' verbose_name = _('population / social group') @@ -191,8 +164,7 @@ class EthnicGroupAlias(ModelCore): ethnic_group = ForeignKey('EthnicGroup', related_name="aliases", verbose_name=_('population / social group')) value = CharField(_('name'), required=True) - notes = generic.GenericRelation(Note) - + class Meta(MetaCore): db_table = 'ethnic_group_aliases' unique_together = (('ethnic_group', 'value'),)