Skip to content

Commit d08d351

Browse files
committed
Make cross-space facet usable by anyone
1 parent 54203f5 commit d08d351

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

app/views/search/common/_facet_sidebar.html.erb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ Variable that should be available
5252
<%= render partial: 'search/common/facet_sidebar_boolean_filter', locals: { facet: facet, resources: resources } %>
5353
<% end %>
5454

55+
<% resource_name = resource_type.model_name.human.downcase.pluralize %>
56+
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
57+
locals: { facet_field: 'across_all_spaces',
58+
count: '-',
59+
enable_text: t('sidebar.filter.values.show_cross_space', resource: resource_name),
60+
disable_text: t('sidebar.filter.values.hide_cross_space', resource: resource_name) } %>
61+
5562
<% if resource_type.name == 'Event' %>
5663
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
5764
locals: { facet_field: 'include_expired',

app/views/search/common/_facet_sidebar_curation.html.erb

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<% show_last_scraped_filter = resource_type.method_defined?(:last_scraped) %>
22
<% show_hidden_filter = resource_type.method_defined?(:user_requires_approval?) %>
3-
<% show_cross_space_filter = current_user&.is_admin? %>
4-
<% resource_name = resource_type.model_name.human.downcase.pluralize %>
53

6-
<% if show_last_scraped_filter || show_hidden_filter || show_cross_space_filter %>
4+
<% if show_last_scraped_filter || show_hidden_filter %>
75
<ul class="unstyled nav-simple">
86
<li>
97
<h4 class="nav-heading mt-4">
@@ -47,13 +45,5 @@
4745
enable_text: t('sidebar.hidden.values.show_hidden'),
4846
disable_text: t('sidebar.hidden.values.hide_hidden') } %>
4947
<% end %>
50-
51-
<% if show_cross_space_filter %>
52-
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
53-
locals: { facet_field: 'across_all_spaces',
54-
count: '-',
55-
enable_text: t('sidebar.filter.values.show_cross_space', resource: resource_name),
56-
disable_text: t('sidebar.filter.values.hide_cross_space', resource: resource_name) } %>
57-
<% end %>
5848
</ul>
5949
<% end %>

lib/facets.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def elixir(scope, value, _)
140140

141141
def across_all_spaces(scope, value, user)
142142
sunspot_scoped(scope) do
143-
all_spaces = (user&.is_admin? && value)
143+
all_spaces = value
144144
with(:space_id, Space.current_space.id) unless all_spaces
145145
end
146146
end

0 commit comments

Comments
 (0)