浏览代码

[search] Wrong collection name used when searching

Romain Rigaux 12 年之前
父节点
当前提交
2c79623
共有 2 个文件被更改,包括 5 次插入22 次删除
  1. 2 19
      apps/search/src/search/templates/layout.mako
  2. 3 3
      apps/search/src/search/views.py

+ 2 - 19
apps/search/src/search/templates/layout.mako

@@ -66,16 +66,6 @@
     <ul class="nav nav-list">
 
     <li class="nav-header">${_('Core')}</li>
-    <li>
-      <div>
-      ##<span class="muted">${ _('Change settings for') }</span>
-      ##<select id="change-core" style="margin-bottom: 0;display: inline">
-      ##  % for c in hue_cores:
-      ##    <option value="${ c.get_absolute_url() }"> ${ c.label } (${ c.name })</option>
-      ##  % endfor
-      ##</select>
-      </div>
-    </li>
       <li class="${ utils.is_selected(section, 'properties') }">
         <a href="${ url('search:admin_core_properties', core=core) }"><i class="icon-reorder"></i> ${_('Properties')}</a>
       </li>
@@ -93,18 +83,11 @@
       <li class="${ utils.is_selected(section, 'highlighting') }">
         <a href="${ url('search:admin_core_highlighting', core=core) }">${_('4. Highlighting')}</a>
       </li>
+
       <li class="nav-header">${_('Search')}</li>
       <li>
-        <a href="${ url('search:index') }?cores=${ core }"><i class="icon-share-alt"></i> ${ _('Query') }</a>
+        <a href="${ url('search:index') }?collection=${ core }"><i class="icon-share-alt"></i> ${ _('Query') }</a>
       </li>
-
-      ##<li class="nav-header">${_('Solr')}</li>
-      ##<li class="${ utils.is_selected(section, 'index') }">
-      ##  <a href="${ url('search:admin_core_solr_properties', core=core) }">${_('Index')}</a>
-      ##</li>
-      ##<li class="${ utils.is_selected(section, 'schema') }">
-      ##  <a href="${ url('search:admin_core_schema', core=core) }">${_('Schema')}</a>
-      ##</li>
     </ul>
   </div>
 </%def>

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

@@ -62,14 +62,14 @@ def index(request):
     solr_query['start'] = search_form.cleaned_data['start'] or 0
     solr_query['facets'] = search_form.cleaned_data['facets'] or 1
 
-    hue_core = Core.objects.get_or_create(name=core)
-
     try:
+      hue_core = Core.objects.get_or_create(name=core)
       response = SolrApi(SOLR_URL.get()).query(solr_query, hue_core)
     except Exception, e:
       error['message'] = unicode(str(e), "utf8")
   else:
     core = cores['status'].keys()[0]
+    hue_core = Core.objects.get_or_create(name=core)
 
   return render('search.mako', request, {
     'search_form': search_form,
@@ -78,7 +78,7 @@ def index(request):
     'solr_query': solr_query,
     'hue_core': hue_core,
     'hue_cores': hue_cores,
-    'current_core': request.GET and request.GET.get('collection', core),
+    'current_core': core,
     'json': json,
   })