Download as
Browse Code »

Commit 9fe4b93562497ac772ed94fad8768d69f9c19329

Authored by Luan
1 parent 29c312c2
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding missing collaborators subfilter and removing icon when filtering by type

Showing 2 changed files with 6 additions and 7 deletions   Show diff stats
src/search/views.py
  Diff comments   View file @9fe4b93
@@ -10,14 +10,17 @@ class ColabSearchView(SearchView): @@ -10,14 +10,17 @@ class ColabSearchView(SearchView):
10 def extra_context(self, *args, **kwargs): 10 def extra_context(self, *args, **kwargs):
11 types = { 11 types = {
12 'wiki': { 12 'wiki': {
13 - 'icon': 'file',  
14 'name': _(u'Wiki'), 13 'name': _(u'Wiki'),
15 'fields': ( 14 'fields': (
16 ('author', _(u'Author'), self.request.GET.get('author')), 15 ('author', _(u'Author'), self.request.GET.get('author')),
  16 + (
  17 + 'collaborators',
  18 + _(u'Collaborators'),
  19 + self.request.GET.get('collaborators'),
  20 + ),
17 ), 21 ),
18 }, 22 },
19 'thread': { 23 'thread': {
20 - 'icon': 'thread',  
21 'name': _(u'Discussion'), 24 'name': _(u'Discussion'),
22 'fields': ( 25 'fields': (
23 ('author', _(u'Author'), self.request.GET.get('author')), 26 ('author', _(u'Author'), self.request.GET.get('author')),
@@ -29,7 +32,6 @@ class ColabSearchView(SearchView): @@ -29,7 +32,6 @@ class ColabSearchView(SearchView):
29 ), 32 ),
30 }, 33 },
31 'ticket': { 34 'ticket': {
32 - 'icon': 'ticket',  
33 'name': _(u'Ticket'), 35 'name': _(u'Ticket'),
34 'fields': ( 36 'fields': (
35 ( 37 (
@@ -72,7 +74,6 @@ class ColabSearchView(SearchView): @@ -72,7 +74,6 @@ class ColabSearchView(SearchView):
72 ), 74 ),
73 }, 75 },
74 'changeset': { 76 'changeset': {
75 - 'icon': 'changeset',  
76 'name': _(u'Changeset'), 77 'name': _(u'Changeset'),
77 'fields': ( 78 'fields': (
78 ('author', _(u'Author'), self.request.GET.get('author')), 79 ('author', _(u'Author'), self.request.GET.get('author')),
@@ -84,7 +85,6 @@ class ColabSearchView(SearchView): @@ -84,7 +85,6 @@ class ColabSearchView(SearchView):
84 ) 85 )
85 }, 86 },
86 'user': { 87 'user': {
87 - 'icon': 'user',  
88 'name': _(u'User'), 88 'name': _(u'User'),
89 'fields': ( 89 'fields': (
90 ( 90 (
src/templates/search/search.html
  Diff comments   View file @9fe4b93
@@ -22,8 +22,7 @@ @@ -22,8 +22,7 @@
22 <li class="selected" title="{% trans "Remove filter" %}"> 22 <li class="selected" title="{% trans "Remove filter" %}">
23 <span class="glyphicon glyphicon-remove"></span> 23 <span class="glyphicon glyphicon-remove"></span>
24 <a href="{% url 'haystack_search' %}?q={{ request.GET.q }}{% if request.GET.order %}&order={{ request.GET.order }}{% endif %}"> 24 <a href="{% url 'haystack_search' %}?q={{ request.GET.q }}{% if request.GET.order %}&order={{ request.GET.order }}{% endif %}">
25 - <span class="glyphicon glyphicon-{{ filters.icon }}"></span>  
26 - {{ filters.name }} 25 + {{ filters.name }}
27 </a> 26 </a>
28 </li> 27 </li>
29 </ul> 28 </ul>