decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

minor changes for filter dialog

Browse source
This commit is contained in:
rolux 2011-06-01 22:47:15 +00:00
parent 16cf98cad6
commit c01bb87c13
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandora/place/models.py
View file

@ -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):

4
pandora/place/views.py
View file

@ -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')

4
static/js/pandora/ui/filter.js
View file

@ -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) {
return {
findKeys: Ox.map(app.site.itemKeys, function(key) {
return key.id == 'all' ? null : {
autocomplete: key.autocomplete,
autocompleteSortKey: key.autocompleteSortKey,
format: key.format,

2
static/js/pandora/ui/filterDialog.js
View file

@ -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;
};