EXPO-33_1-2 ready

templates/client/includes/catalog_search.html

@@ -36,23 +36,23 @@
                 <div class="search-line sl-options">
                     {% if search_form.th %}
                         <div class="sf-field-wrap no-wrap">{% trans 'Тематика: ' %}
-                            <a class="search-modal-open" href="#pwSubj" id="subj-modal-trigger" data-default="{{ search_form.get_themes_display }}">
+                            <a class="search-modal-open" href="#pwSubj" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
-								{{ search_form.get_themes_display }}
+								{# search_form.get_themes_display #}{% trans 'Не важно' %}
 							</a>
 							<span class="clear-all-button">&nbsp;</span>
                         </div>
                     {% endif %}
                     {% if search_form.place_type %}
                         <div class="sf-field-wrap">{% trans 'Тип: ' %}
-                            <a class="search-modal-open" href="#pw-place_type" id="subj-modal-trigger" data-default="{{ search_form.get_themes_display }}">
+                            <a class="search-modal-open" href="#pw-place_type" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
-								bla
+								{% trans 'Не важно' %}
 							</a>
                         </div>
                     {% endif %}
                     {% if search_form.area %}
                     <div class="sf-field-wrap no-wrap">{% trans 'Место: ' %}
-                        <a class="search-modal-open" href="#pwPlace" id="place-modal-trigger" data-default="{{ search_form.get_places_display }}">
+                        <a class="search-modal-open" href="#pwPlace" id="place-modal-trigger" data-default="{% trans 'Не важно' %}">
-                        {{ search_form.get_places_display }}
+                        {# search_form.get_places_display #}{% trans 'Не важно' %}
                         </a>
 						<span class="clear-all-button">&nbsp;</span>
 					</div>
@@ -69,7 +69,7 @@
                                     по {{ search_form.to.value }}
                                 {% endif %}
                             {% else %}
-                                Не важно
+								{% trans 'Не важно' %}
                             {% endif %}
                             </a>
 							<span class="clear-all-button">&nbsp;</span>

templates/client/includes/catalog_search_main.html

@@ -41,23 +41,25 @@
 					<div class="search-line sl-options">
 						{% if search_form.th %}
 						<div class="sf-field-wrap no-wrap">{% trans 'Тематика: ' %}
-							<a class="search-modal-open" href="#pwSubj" id="subj-modal-trigger" data-default="{{ search_form.get_themes_display }}">
+							<a class="search-modal-open" href="#pwSubj" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
-								{{ search_form.get_themes_display }}
+								{# search_form.get_themes_display #}
+								{% trans 'Не важно' %}
 							</a>
 							<span class="clear-all-button">&nbsp;</span>
 						</div>
 						{% endif %}
 						{% if search_form.place_type %}
 						<div class="sf-field-wrap">{% trans 'Тип: ' %}
-							<a class="search-modal-open" href="#pw-place_type" id="subj-modal-trigger" data-default="{{ search_form.get_themes_display }}">
+							<a class="search-modal-open" href="#pw-place_type" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
-								bla
+								{% trans 'Не важно' %}
 							</a>
 						</div>
 						{% endif %}
 						{% if search_form.area %}
 						<div class="sf-field-wrap no-wrap">{% trans 'Место: ' %}
-							<a class="search-modal-open" href="#pwPlace" id="place-modal-trigger" data-default="{{ search_form.get_places_display }}">
+							<a class="search-modal-open" href="#pwPlace" id="place-modal-trigger" data-default="{% trans 'Не важно' %}">
-								{{ search_form.get_places_display }}
+								{# search_form.get_places_display #}
+								{% trans 'Не важно' %}
 							</a>
 							<span class="clear-all-button">&nbsp;</span>
 						</div>

templates/client/static_client/js/_modules/block.search.js

@@ -2098,7 +2098,7 @@ if (EXPO.searchBlock){
 
 			},
 			/**
-			 * functionality of selected object in autocomplete list
+			 * fires after autocomplete is done and user selects item in it
 			 * @param {Object} event
 			 * @param {Object} ui
 			 * @private
@@ -2137,6 +2137,7 @@ if (EXPO.searchBlock){
 
 			},
 			/**
+			 * this property must be redefined for each individual instances of MainField Object
 			 * select checkboxes if there is coincidence with search result and modal subject modal window
 			 * @param {number} id
 			 * @param {string} name
@@ -2257,6 +2258,7 @@ if (EXPO.searchBlock){
 						name:name,
 						id:id
 					};
+					EXPO.searchBlock.subjModal.resetList();
 					getRequest(nestedObj, EXPO.searchBlock.subjModal.opt.getParentUrl, function (data) {
 
 						EXPO.searchBlock.subjModal._loadParentTree(data, function(){
@@ -2266,6 +2268,7 @@ if (EXPO.searchBlock){
 					});
 				} else{
 					$waiter.hide();
+					EXPO.searchBlock.subjModal.resetList();
 					$(DOMCheckboxes).prop('checked', true);
 					$(DOMCheckboxes).trigger('change');
 				}
@@ -2283,6 +2286,7 @@ if (EXPO.searchBlock){
 						name:name,
 						id:id
 					};
+					EXPO.searchBlock.placesModal.resetList();
 					getRequest(nestedObj, EXPO.searchBlock.placesModal.opt.getParentUrl, function (data) {
 
 						EXPO.searchBlock.placesModal._loadParentTree(data, function(){
@@ -2292,6 +2296,8 @@ if (EXPO.searchBlock){
 					});
 				} else{
 					$waiter.hide();
+					EXPO.searchBlock.placesModal.resetList();
+
 					$(DOMCheckboxes).prop('checked', true);
 					$(DOMCheckboxes).trigger('change');
 				}