t79: search places modal names fix + remove areas duplicatig

remotes/origin/t79_search_places_modal
Slava Kyrachevsky 9 years ago
parent b8e2ccfe26
commit 9b3e54a490
  1. 2
      apps/country/manager.py
  2. 7
      static/client/js/_modules/block.search.js
  3. 2
      static/client/js_min/_modules/block.search.min.js
  4. 1
      templates/client/popups/place.html

@ -133,7 +133,7 @@ class AreaManager(TranslationManager):
result = cache.get(key) result = cache.get(key)
else: else:
model = self.model model = self.model
result = list(model.objects.language().filter()) result = set(model.objects.language().filter())
#result.sort(key=lambda x: len(x.expos()), reverse=True) #result.sort(key=lambda x: len(x.expos()), reverse=True)
cache.set(key, result, self.cache_time) cache.set(key, result, self.cache_time)
return result return result

@ -1301,7 +1301,6 @@ if (EXPO.searchBlock){
self.resetList(); self.resetList();
EXPO.searchBlock.placesField.clearValue() EXPO.searchBlock.placesField.clearValue()
}); });
}); });
@ -1429,14 +1428,14 @@ if (EXPO.searchBlock){
} }
} }
if($('#id_'+item.id+':checked').length){ if($('#id_'+item.id+'[name="' + item.name + '"]:checked').length){
firstTime = false; firstTime = false;
$('#id_'+item.id+':checked').trigger('change'); $('#id_'+item.id+':checked').trigger('change');
} }
// ban of repeating execution // ban of repeating execution
if (firstTime) { // konec if (firstTime) { // konec
self.isReceived = false; self.isReceived = false;
var $checkbox = $('#id_' + item.id), var $checkbox = $('#id_' + item.id + '[name="' + item.name + '"]'),
requestObj, requestName, requestObj, requestName,
treeLoadHandler = function (data) { treeLoadHandler = function (data) {
// make checkboxes selected after loading // make checkboxes selected after loading
@ -2319,9 +2318,7 @@ if (EXPO.searchBlock){
}; };
EXPO.searchBlock.placesModal.resetList(); EXPO.searchBlock.placesModal.resetList();
getRequest(nestedObj, EXPO.searchBlock.placesModal.opt.getParentUrl, function (data) { getRequest(nestedObj, EXPO.searchBlock.placesModal.opt.getParentUrl, function (data) {
EXPO.searchBlock.placesModal._loadParentTree(data, function(){ EXPO.searchBlock.placesModal._loadParentTree(data, function(){
EXPO.searchBlock.placesModal._checkCheckBox(id, true); EXPO.searchBlock.placesModal._checkCheckBox(id, true);
}); });
}); });

File diff suppressed because one or more lines are too long

@ -36,7 +36,6 @@
<div class="places-list"> <div class="places-list">
<!-- id for dna.js template, layout is in catalog_search.html--> <!-- id for dna.js template, layout is in catalog_search.html-->
<ul class="sublist parent"> <ul class="sublist parent">
{% for value, text in search_form.area.field.choices %} {% for value, text in search_form.area.field.choices %}
<li class="level1 level"> <li class="level1 level">

Loading…
Cancel
Save