minor changes for filter dialog

pandora/place/models.py

@@ -71,10 +71,15 @@ class Place(models.Model):
         return j
 
     def update_matches(self):
+        """
+        import random
+        self.matches = random.randint(0, 100)
+        """
         q = Q(value__icontains=self.name)
         for name in self.alternativeNames:
             q = q|Q(value__icontains=name)
         self.matches = Annotation.objects.filter(q).count()
+
         self.save()
 
     def save(self, *args, **kwargs):

pandora/place/views.py

@@ -52,7 +52,7 @@ def addPlace(request):
                 value = tuple(value)
             setattr(place, key, value)
         place.save()
-        tasks.update_matches.delay(place.id)
+        #tasks.update_matches.delay(place.id)
         response = json_response(place.json())
     else:
         response = json_response(status=403, text='place name exists')
@@ -91,7 +91,7 @@ def editPlace(request):
                         value = tuple(value)
                     setattr(place, key, value)
             place.save()
-            tasks.update_matches.delay(place.id)
+            #tasks.update_matches.delay(place.id)
             response = json_response(place.json())
         else:
             response = json_response(status=403, text='place name/geoname conflict')

static/js/pandora/ui/filter.js

@@ -1,8 +1,8 @@
 // vim: et:ts=4:sw=4:sts=4:ft=js
 pandora.ui.filter = function() {
     var that = new Ox.Filter({
-        findKeys: $.map(app.site.itemKeys, function(key) {
+        findKeys: Ox.map(app.site.itemKeys, function(key) {
-            return {
+            return key.id == 'all' ? null : {
                 autocomplete: key.autocomplete,
                 autocompleteSortKey: key.autocompleteSortKey,
                 format: key.format,

static/js/pandora/ui/filterDialog.js

@@ -34,7 +34,7 @@ pandora.ui.filterDialog = function() {
         height: 264,
         keys: {enter: 'save', escape: 'cancel'},
         title: 'Advanced Find',
-        width: 616 + Ox.UI.SCROLLBAR_SIZE
+        width: 648 + Ox.UI.SCROLLBAR_SIZE
     });
     return that;
 };