Cleanup file search

Author: ericholscher

readthedocs/search/views.py

@@ -39,14 +39,16 @@ def elastic_search(request, project_slug=None):
 
     :param project_slug: Sent when the view is a project search
     """
+    _type = None
 
     if project_slug:
         queryset = Project.objects.protected(request.user)
         project_obj = get_object_or_404(queryset, slug=project_slug)
+        _type = request.GET.get('type', 'file')
 
     user_input = UserInput(
         query=request.GET.get('q'),
-        type=request.GET.get('type', 'project'),
+        type=_type or request.GET.get('type', 'project'),
         project=project_slug or request.GET.get('project'),
         version=request.GET.get('version', LATEST),
         taxonomy=request.GET.get('taxonomy'),

readthedocs/templates/search/elastic_search.html

@@ -28,7 +28,9 @@
   <ul>
       <h5>{% trans 'Object Type' %}</h5>
       {# <li class="{% if type == 'all' %}active{% endif %}"><a href="?{% url_replace request 'type' 'all' %}">{% trans 'All' %}</a></li> #}
+      {% if not project %}
       <li class="{% if type == 'project' %}active{% endif %}"><a href="?{% url_replace request 'type' 'project' %}">{% trans 'Projects' %}</a></li>
+      {% endif %}
       <li class="{% if type == 'file' %}active{% endif %}"><a href="?{% url_replace request 'type' 'file' %}">{% trans 'Files' %}</a></li>
       <li class="{% if type == 'domain' %}active{% endif %}"><a href="?{% url_replace request 'type' 'domain' %}">{% trans 'Code API' %}</a></li>