Adding missing collaborators subfilter and removing icon when filtering by type

Luan
1 parent 29c312c2
Showing 2 changed files with 6 additions and 7 deletions Show diff stats
src/search/views.py
src/templates/search/search.html
@@ -10,14 +10,17 @@ class ColabSearchView(SearchView):
     def extra_context(self, *args, **kwargs):
         types = {
             'wiki': {
-                'icon': 'file',
                 'name': _(u'Wiki'),
                 'fields': (
                     ('author', _(u'Author'), self.request.GET.get('author')),
+                    (
+                        'collaborators',
+                        _(u'Collaborators'),
+                        self.request.GET.get('collaborators'),
+                    ),
                 ),
             },
             'thread': {
-                'icon': 'thread',
                 'name': _(u'Discussion'),
                 'fields': (
                     ('author', _(u'Author'), self.request.GET.get('author')),
@@ -29,7 +32,6 @@ class ColabSearchView(SearchView):
                 ),
             },
             'ticket': {
-                'icon': 'ticket',
                 'name': _(u'Ticket'),
                 'fields': (
                     (
@@ -72,7 +74,6 @@ class ColabSearchView(SearchView):
                 ),
             },
             'changeset': {
-                'icon': 'changeset',
                 'name': _(u'Changeset'),
                 'fields': (
                     ('author', _(u'Author'), self.request.GET.get('author')),
@@ -84,7 +85,6 @@ class ColabSearchView(SearchView):
                 )
             },
             'user': {
-                'icon': 'user',
                 'name': _(u'User'),
                 'fields': (
                     (
@@ -22,8 +22,7 @@
           <li class="selected" title="{% trans "Remove filter" %}">
             <span class="glyphicon glyphicon-remove"></span>
               <a href="{% url 'haystack_search' %}?q={{ request.GET.q }}{% if request.GET.order %}&order={{ request.GET.order }}{% endif %}">
-                  <span class="glyphicon glyphicon-{{ filters.icon }}"></span>
-                  {{ filters.name }}
+                {{ filters.name }}
               </a>
           </li>
         </ul>