bug with filter

templates/client/includes/catalog_search.html

@@ -112,12 +112,12 @@
 		closerTextSingle:"{% trans ' и еще _ позиция' %}",
 		place:{
 			id:'pwPlace',
-			/**/selectedItemTemplate:'csb-selected',
+			selectedItemTemplate:'csb-selected',
 			ajaxUrl:'http://{{ request.get_host }}/search-form/',
 			autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/',
 			getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
-			/**/autoCompleteId:'filter-complete-block',
-			/**/filterInputId:'place-filter-input',
+			autoCompleteId:'filter-complete-block',
+			filterInputId:'place-filter-input',
 			modalTrigger:'place-modal-trigger',
 			selectedItemsContainer:'csb-selected-items',
 			clearAllButtonClass:'clear-all-button',
@@ -126,15 +126,15 @@
 		},
 		subject:{
 			id:'pwSubj',
-			/**/selectedItemTemplate:'csb-subj-selected',
-			/**/autoCompleteId:'subj-filter-complete-block',
+			selectedItemTemplate:'csb-subj-selected',
+			autoCompleteId:'subj-filter-complete-block',
 			ajaxUrl:'http://{{ request.get_host }}/search-form/',
 			autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/',
-			/**/filterInputId:'subj-fliter-input',
+			filterInputId:'subj-fliter-input',
 			modalTrigger:'subj-modal-trigger',
 			getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
-			/**/selectedItemsContainer:'csb-subj-selected-items',
-			/**/subjectTriggerWrapId:'subj-checks',
+			selectedItemsContainer:'csb-subj-selected-items',
+			subjectTriggerWrapId:'subj-checks',
 			//switched by default
 			defaultOn:['exhibition-check','conference-check'],
 			clearAllButtonClass:'clear-all-button',

templates/client/popups/place.html

@@ -107,7 +107,7 @@
 				</div>
 			</div>
 			<div class="pwf-buttons-line">
-				<button class="icon-check modal-approve">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
+				<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
 				{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 			</div>
 		</div>

templates/client/popups/theme.html

@@ -73,7 +73,7 @@
 						</div>
 					</div>
 					<div class="pwf-buttons-line">
-						<button class="icon-check modal-approve">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
+						<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
 						{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 					</div>
 				</div>

templates/client/static_client/js/_modules/page.events.feed.js

@@ -1220,14 +1220,14 @@ if (EXPO.events.feed) {
 
 							}
 						}
-						if ($('#id_' + item.id + ':checked').length) {
+						if ($('#id_'+ self.opt.prefix + item.id + ':checked').length) {
 							firstTime = false;
-							$('#id_' + item.id + ':checked').trigger('change');
+							$('#id_'+ self.opt.prefix + item.id + ':checked').trigger('change');
 						}
 						// ban of repeating execution
 						if (firstTime) { // konec
 							self.isReceived = false;
-							var $checkbox = $('#id_' + item.id),
+							var $checkbox = $('#id_'+ self.opt.prefix + item.id),
 								requestObj, requestName,
 								treeLoadHandler = function (data) {
 									// make checkboxes selected after loading
@@ -1236,7 +1236,7 @@ if (EXPO.events.feed) {
 										self._checkCheckBox(item.id);
 										self.isReceived = true;
 									});
-									$checkbox = $('#id_' + item.id);
+									$checkbox = $('#id_'+ self.opt.prefix + item.id);
 								};
 							// load tree related to selected item
 							if (!$checkbox.length) {
@@ -1256,8 +1256,8 @@ if (EXPO.events.feed) {
 							}
 
 						} else {
-							$('#id_' + item.id).prop('checked', true);
-							$('#id_' + item.id).trigger('change');
+							$('#id_'+ self.opt.prefix + item.id).prop('checked', true);
+							$('#id_'+ self.opt.prefix + item.id).trigger('change');
 						}
 					};
 				this.wait(waitHandler);
@@ -1658,7 +1658,6 @@ if (EXPO.events.feed) {
 							}else if (self.previousSearch.inputs[i].children){
 								self.placesModal.selectTag(self.previousSearch.inputs[i].children);
 
-
 							} else if(self.previousSearch.inputs[i]){
 								self.placesModal.selectTag(self.previousSearch.inputs[i]);