add location name sort in media item edit forms

diff --git a/telemeta/models/location.py b/telemeta/models/location.py
index 85bbc6bca10671082049636b17bfffa6c0a81a4a..47b46ffe99cb701e0d7166de48874e16ace647d9 100644 (file)
--- a/telemeta/models/location.py
+++ b/telemeta/models/location.py
@@ -38,7 +38,8 @@ from telemeta.util.unaccent import unaccent
 import re
 from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
-from telemeta.models import query
+from telemeta.models.query import *
+from django.forms import ModelForm
 
 class Location(ModelCore):
     "Locations"
@@ -56,7 +57,7 @@ class Location(ModelCore):
     longitude        = FloatField(null=True)                                    
     is_authoritative = BooleanField(_('authoritative'))
 
-    objects = query.LocationManager()
+    objects = LocationManager()
 
     def items(self):
         from telemeta.models import MediaItem
@@ -183,3 +184,12 @@ class LocationRelation(ModelCore):
             sep = ' >..> ' 
         return unicode(self.ancestor_location) + sep + unicode(self.location)
 
+
+class LocationForm(ModelForm):
+    class Meta:
+        model = Location
+
+    def __init__(self, *args, **kwds):
+        super(LocationForm, self).__init__(*args, **kwds)
+        self.fields['name'].queryset = Location.objects.order_by('name')
+        

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 4138c06812c91f6645cefa0ce85eb55c05f04a8b..f2e493b0af738db94754d3d86720704e66ea9c01 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -322,7 +322,11 @@ class MediaItem(MediaResource):
 class MediaItemForm(ModelForm):
     class Meta:
         model = MediaItem
-
+    
+    def __init__(self, *args, **kwds):
+        super(MediaItemForm, self).__init__(*args, **kwds)
+        self.fields['location'].queryset = Location.objects.order_by('name')
+        
 class MediaItemKeyword(ModelCore):
     "Item keyword"
     item    = ForeignKey('MediaItem', verbose_name=_('item'), related_name="keyword_relations")