Эх сурвалжийг харах

[search] "sort by" dropdown is broken

Romain Rigaux 12 жил өмнө
parent
commit
0c6d559

+ 2 - 1
apps/search/src/search/templates/admin_core_sorting.mako

@@ -43,7 +43,8 @@ ${ commonheader(_('Search'), "search", user) | n,unicode }
             </label>
           </div>
           <h3>${_('Sorting')}</h3>
-          ${_('Specify on which field and order the results are sorted.')}
+          ${_('Specify on which fields and order the results are sorted by default.')}
+          ${_('The sorting is a combination of the fields, from left to right.')}
           <span data-bind="visible: ! isEnabled()"><strong>${_('Sorting is currently disabled.')}</strong></span>
         </div>
       </div>

+ 3 - 3
apps/search/src/search/templates/admin_core_template.mako

@@ -134,8 +134,8 @@ ${ commonheader(_('Search'), "search", user) | n,unicode }
   <%def name="content()">
     <ul class="nav nav-tabs">
       <li class="active"><a href="#visual" data-toggle="tab">${_('Visual editor')}</a></li>
-      <li><a href="#source" data-toggle="tab">${_('Source')}</a></li>
       <li><a href="#preview" data-toggle="tab">${_('Preview')}</a></li>
+      <li><a href="#source" data-toggle="tab">${_('Source')}</a></li>
       <li><a href="#extra" data-toggle="tab">${_('Advanced')}</a></li>
     </ul>
     <div class="tab-content">
@@ -160,7 +160,7 @@ ${ commonheader(_('Search'), "search", user) | n,unicode }
                 <h5>${_('Available Fields')}</h5>
               </div>
               <div class="widget-content">
-                <select data-bind="options: availableFields, value: selectedVisualField" class="input-medium chzn-select"></select>
+                <select data-bind="options: availableFields, value: selectedVisualField" class="input-large chzn-select"></select>
                 <a title="${ _('Click on this button to add the field') }" class="btn btn-small" data-bind="click: $root.addFieldToVisual">
                   <i class="icon-plus"></i>
                 </a>
@@ -174,7 +174,7 @@ ${ commonheader(_('Search'), "search", user) | n,unicode }
                 <h5>${_('Available Functions')}</h5>
               </div>
               <div class="widget-content">
-                <select id="visualFunctions" data-bind="value: selectedVisualFunction" class="input-medium chzn-select">
+                <select id="visualFunctions" data-bind="value: selectedVisualFunction" class="input-large chzn-select">
                   <option title="${ _('Formats a date in the DD-MM-YYYY format') }" value="{{#date}} {{/date}}">{{#date}}</option>
                   <option title="${ _('Formats a date in the HH:mm:ss format') }" value="{{#time}} {{/time}}">{{#time}}</option>
                   <option title="${ _('Formats a date in the DD-MM-YYYY HH:mm:ss format') }" value="{{#datetime}} {{/datetime}}">{{#datetime}}</option>

+ 5 - 5
apps/search/src/search/templates/search.mako

@@ -86,10 +86,10 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
           % for group, count in macros.pairwise(fld['counts']):
             %if count > 0 and group != "" and found_value == "":
               % if fld['type'] == 'field':
-                <li><a href='?collection=${ current_cores }&query=${ solr_query['q'] }&fq=${ solr_query['fq'] }|${ fld['field'] }:"${ urllib.quote_plus(group.encode('ascii', 'xmlcharrefreplace')) }"${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}'>${group}</a> <span class="counter">(${ count })</span></li>
+                <li><a href='?collection=${ current_core }&query=${ solr_query['q'] }&fq=${ solr_query['fq'] }|${ fld['field'] }:"${ urllib.quote_plus(group.encode('ascii', 'xmlcharrefreplace')) }"${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}'>${group}</a> <span class="counter">(${ count })</span></li>
               % endif
               % if fld['type'] == 'range':
-                <li><a href='?collection=${ current_cores }&query=${ solr_query['q'] }&fq=${ solr_query['fq'] }|${ fld['field'] }:["${ group }" TO "${ str(int(group) + int(fld['gap']) - 1) }"]${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}'>${ group } (${ count })</a></li>
+                <li><a href='?collection=${ current_core }&query=${ solr_query['q'] }&fq=${ solr_query['fq'] }|${ fld['field'] }:["${ group }" TO "${ str(int(group) + int(fld['gap']) - 1) }"]${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}'>${ group } (${ count })</a></li>
               % endif
               % if fld['type'] == 'date':
                 <li class="dateFacetItem"><a href='?collection=${ current_core }&query=${ solr_query['q'] }&fq=${ solr_query['fq'] }|${ fld['field'] }:"${ group }"${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}'><span class="dateFacet">${ group }</span> (${ count })</a></li>
@@ -97,10 +97,10 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
             %endif
             % if found_value != "":
               % if fld['type'] == 'field' and '"' + group + '"' == found_value:
-                <li><strong>${ group }</strong> <a href="?collection=${ current_cores }&query=${ solr_query['q'] }&fq=${'|'.join(remove_list)}${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}"><i class="icon-remove"></i></a></li>
+                <li><strong>${ group }</strong> <a href="?collection=${ current_core }&query=${ solr_query['q'] }&fq=${'|'.join(remove_list)}${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}"><i class="icon-remove"></i></a></li>
               %endif
               % if fld['type'] == 'range' and '["' + group + '" TO "' + str(int(group) + int(fld['gap']) - 1) + '"]' == found_value:
-                <li><strong>${ group }</strong> <a href="?collection=${ current_cores }&query=${ solr_query['q'] }&fq=${'|'.join(remove_list)}${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}"><i class="icon-remove"></i></a></li>
+                <li><strong>${ group }</strong> <a href="?collection=${ current_core }&query=${ solr_query['q'] }&fq=${'|'.join(remove_list)}${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}"><i class="icon-remove"></i></a></li>
               %endif
               % if fld['type'] == 'date' and '"' + group + '"' == found_value:
                 <li><strong><span class="dateFacet">${group}</span></strong> <a href="?collection=${ current_core }&query=${ solr_query['q'] }&fq=${'|'.join(remove_list)}${solr_query.get("sort") and '&sort=' + solr_query.get("sort") or ''}"><i class="icon-remove"></i></a></li>
@@ -312,7 +312,7 @@ ${ hue_core.result.get_extracode() | n,unicode }
       if ($(".sort-by").val() == "") {
         _sort = "";
       }
-      location.href = "?query=${solr_query["q"]}&fq=${solr_query["fq"]}&rows=${solr_query["rows"]}&start=${solr_query["start"]}" + _sort != "" ? "&sort=" + _sort : "";
+      location.href = "?query=${solr_query["q"]}&fq=${solr_query["fq"]}&rows=${solr_query["rows"]}&start=${solr_query["start"]}" + (_sort != "" ? "&sort=" + _sort : "");
     });
 
     $("#id_query").on("click", function (e) {

+ 1 - 1
apps/search/src/search/views.py

@@ -226,7 +226,7 @@ def admin_core_schema(request, core):
   hue_core = Core.objects.get(name=core)
   hue_cores = Core.objects.all()
 
-  content = render('admin_core_properties_solr_schema', request, {
+  content = render('admin_core_properties_solr_schema.mako', request, {
     'solr_schema': solr_schema,
     'hue_core': hue_core,
     'hue_cores': hue_cores,