diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 0b2e0f9..3b08ced 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -70,7 +70,7 @@ module SearchHelper if display?(asset, display) display else - item.default_search_display + item.class.default_search_display end end @@ -88,6 +88,7 @@ module SearchHelper end def display_selector(asset, display, float = 'right') + display ||= asset_class(asset).default_search_display if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {|option| option}.count > 1 compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil diff --git a/app/models/article.rb b/app/models/article.rb index 4c1adb8..ee7ee31 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -18,7 +18,7 @@ class Article < ActiveRecord::Base SEARCH_DISPLAYS = %w[full] - def default_search_display + def self.default_search_display 'full' end diff --git a/app/models/product.rb b/app/models/product.rb index e2bc0c1..c81982e 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -11,7 +11,7 @@ class Product < ActiveRecord::Base SEARCH_DISPLAYS = %w[map full] - def default_search_display + def self.default_search_display 'full' end diff --git a/app/models/profile.rb b/app/models/profile.rb index 7aaac5f..bbcd464 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -15,7 +15,7 @@ class Profile < ActiveRecord::Base SEARCH_DISPLAYS = %w[compact] - def default_search_display + def self.default_search_display 'compact' end diff --git a/app/views/search/category_index.rhtml b/app/views/search/category_index.rhtml index 843e0f7..41c8c5a 100644 --- a/app/views/search/category_index.rhtml +++ b/app/views/search/category_index.rhtml @@ -4,8 +4,7 @@
<%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %>
<% end %> - <%= search_page_title(_('Search Results'), @category) %> - <%= render :partial => 'search_form', :locals => { :hint => '' } %> +

<%= _("Category Index") %>

<%= category_context(@category, params) %> <%= display_results @searches %> diff --git a/plugins/solr/controllers/public/solr_plugin_public_controller.rb b/plugins/solr/controllers/public/solr_plugin_public_controller.rb deleted file mode 100644 index 9e9af04..0000000 --- a/plugins/solr/controllers/public/solr_plugin_public_controller.rb +++ /dev/null @@ -1,22 +0,0 @@ -# TODO This controller was created to remove the solr dependencies from -# noosfero controllers. All actions here might not be working as they're -# supposed to. Everything here must be reviewed! - -class SolrPluginPublicController < MyProfileController - - include SolrPlugin::ResultsHelper - - - def facets_browse - @asset = params[:asset].to_sym - @asset_class = asset_class(@asset) - - @facets_only = true - send(@asset) - - @facet = @asset_class.map_facets_for(environment).find { |facet| facet[:id] == params[:facet_id] } - raise 'Facet not found' if @facet.nil? - - render :layout => false - end -end diff --git a/plugins/solr/views/search/_facets_menu.html.erb b/plugins/solr/views/search/_facets_menu.html.erb index 1893876..cd6ac2c 100644 --- a/plugins/solr/views/search/_facets_menu.html.erb +++ b/plugins/solr/views/search/_facets_menu.html.erb @@ -23,7 +23,7 @@ <% if facet_count > less_options_limit %> <%= link_to_function _("Options"), - "facet_options_toggle('#{facet[:id].to_s}', '#{url_for(params.merge(:action => 'facets_browse', :facet_id => facet[:id], :asset => @asset, :escape => false))}'); " + + "facet_options_toggle('#{facet[:id].to_s}', '#{url_for(params.merge(:controller => 'solr_plugin_controller' :action => 'facets_browse', :facet_id => facet[:id], :asset => @asset, :escape => false))}'); " + "jQuery(this).toggleClass('facet-less-options')", :class => "facet-options-toggle" %>
<% end %> -- libgit2 0.21.2