瀏覽代碼

[search] Authorize search page without a dashboard

Romain Rigaux 11 年之前
父節點
當前提交
c355f83
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 0 1
      apps/search/src/search/templates/search2.mako
  2. 2 2
      apps/search/static/js/search.ko.js

+ 0 - 1
apps/search/src/search/templates/search2.mako

@@ -30,7 +30,6 @@ ${ commonheader(_('Search'), "search", user, "60px") | n,unicode }
   % if user.is_superuser:
     <div class="pull-right" style="padding-right:50px">
       <button type="button" title="${ _('Edit') }" rel="tooltip" data-placement="bottom" data-bind="click: toggleEditing, css: {'btn': true, 'btn-inverse': isEditing}"><i class="fa fa-pencil"></i></button>
-      <button type="button" title="${ _('Settings') }" rel="tooltip" data-placement="bottom" data-bind="css: {'btn': true}"><i class="fa fa-cogs"></i></button>    
       <button type="button" title="${ _('Save') }" rel="tooltip" data-placement="bottom" data-loading-text="${ _("Saving...") }"  data-bind="click: save, css: {'btn': true}"><i class="fa fa-save"></i></button>
       <button type="button" title="${ _('Share') }" rel="tooltip" data-placement="bottom" data-bind="css: {'btn': true}"><i class="fa fa-link"></i></button>
       &nbsp;&nbsp;&nbsp;            

+ 2 - 2
apps/search/static/js/search.ko.js

@@ -199,10 +199,10 @@ var Query = function (vm, query) {
   self.fqs = ko.mapping.fromJS(query.fqs);
   var defaultMultiqGroup = {'id': 'query', 'label': 'query'};
   self.multiqs = ko.computed(function () { // List of widgets supporting multiqs
-	var histogram_id = vm.collection.getHistogramFacet().id();
+	var histogram_id = vm.collection.getHistogramFacet();
     return [defaultMultiqGroup].concat(
         $.map($.grep(self.fqs(), function(fq, i) {
-            return (fq.type() == 'field' || fq.type() == 'range') && histogram_id != fq.id();
+            return (fq.type() == 'field' || fq.type() == 'range') && (histogram_id == null || histogram_id.id() != fq.id());
         }), function(fq) { return {'id': fq.id(), 'label': fq.field()} })
       );
   });