Changeset 44cc478

Timestamp:

12/09/11 17:40:58 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

97e4abc

Parents:

06ce8dd

git-author:

yomguy <yomguy@…> (12/09/11 17:40:58)

git-committer:

yomguy <yomguy@…> (12/09/11 17:40:58)

Message:

add languages table to receive ISO 639-3 data

Location:

telemeta

Files:

• admin.py (modified) (6 diffs)
• forms/__init__.py (modified) (1 diff)
• forms/language.py (added)
• models/__init__.py (modified) (1 diff)
• models/language.py (added)
• models/media.py (modified) (2 diffs)

telemeta/admin.py

@@ -2 +2 @@
 from telemeta.models.instrument import *
 from telemeta.models.location import *
+from telemeta.models.language import *
 from django.contrib import admin
 
@@ -16 +17 @@
 class MediaItemRelatedAdmin(admin.ModelAdmin):
     search_fields = ['title', 'description']
-    
+
 class MediaPartAdmin(admin.ModelAdmin):
     search_fields = ['title', 'item__code']
@@ -24 +25 @@
     search_fields = ['name']
     ordering = ['name']
-    
+
 class InstrumentAliasAdmin(admin.ModelAdmin):
     search_fields = ['name']
@@ -32 +33 @@
     search_fields = ['instrument__name', 'parent_instrument__name']
     ordering = ['parent_instrument__name']
-     
+
 class InstrumentAliasRelationAdmin(admin.ModelAdmin):
     search_fields = ['alias__name', 'instrument__name']
@@ -40 +41 @@
     search_fields = ['name']
     ordering = ['name']
-     
+
 class LocationAliasAdmin(admin.ModelAdmin):
     search_fields = ['location__name', 'alias']
     ordering = ['alias']
-     
+
 class LocationRelationAdmin(admin.ModelAdmin):
     search_fields = ['location__name', 'ancestor_location__name']
     ordering = ['ancestor_location__name']
+
+class LanguageAdmin(admin.ModelAdmin):
+    search_fields = ['name', 'identifier']
+    ordering = ['name']
+
 
 admin.site.register(MediaCollection, MediaCollectionAdmin)
@@ -64 +70 @@
 admin.site.register(LocationRelation, LocationRelationAdmin)
 
+admin.site.register(Language, LanguageAdmin)

telemeta/forms/__init__.py

@@ -1 +1 @@
 
 from media import *
+from language import *

telemeta/models/__init__.py

@@ -42 +42 @@
 from query import *
 from dublincore import *
+from language import *
 
-

telemeta/models/media.py

@@ -49 +49 @@
 from telemeta.models.instrument import *
 from telemeta.models.enum import *
-from django.db.models.fields import URLField
-
+from telemeta.models.language import *
+from django.db import models
 
 collection_published_code_regex   = '[A-Za-z0-9._-]*'
@@ -336 +336 @@
                                            verbose_name=_('population / social group'))
     language              = CharField(_('language'))
+    language_iso          = ForeignKey('Language', related_name="items",
+                                       verbose_name=_('ISO language'), blank=True,
+                                        null=True, on_delete=models.SET_NULL)
     context_comment       = TextField(_('comments / ethnographic context'))
     moda_execut           = CharField(_('moda_execut'))