diff --git a/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb b/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb index 92cbf8b..49982a6 100644 --- a/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb +++ b/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb @@ -1,6 +1,18 @@ class ElasticsearchPluginController < ApplicationController - def communities - @communities = environment.communities + no_design_blocks + + def search + @results = [] + + @checkbox = {:articles => params[:articles].present?, + :communities => params[:communities].present?, + :people => params[:people].present? + } + + @results += Article.__elasticsearch__.search('{}').records.to_a if params[:articles] + @results += Community.__elasticsearch__.search('{}').records.to_a if params[:communities] + @results += Person.__elasticsearch__.search('{}').records.to_a if params[:people] end + end diff --git a/plugins/elasticsearch/lib/elasticsearch_plugin.rb b/plugins/elasticsearch/lib/elasticsearch_plugin.rb index a8c138b..ffb0c4d 100644 --- a/plugins/elasticsearch/lib/elasticsearch_plugin.rb +++ b/plugins/elasticsearch/lib/elasticsearch_plugin.rb @@ -12,6 +12,9 @@ class ElasticsearchPlugin < Noosfero::Plugin Noosfero::Application.class_eval do config.after_initialize do + + Rails.application.eager_load! #TODO: REMOVE THIS LINE + models = ActiveRecord::Base.descendants.select do |model| model.const_defined?("SEARCHABLE_FIELDS") end diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_article_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_article_display.html.erb new file mode 100644 index 0000000..cd586ab --- /dev/null +++ b/plugins/elasticsearch/views/elasticsearch_plugin/_article_display.html.erb @@ -0,0 +1,2 @@ + +Article: <%= article.name %> diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb new file mode 100644 index 0000000..f35c383 --- /dev/null +++ b/plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb @@ -0,0 +1 @@ +Community: <%= community.name %> diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb new file mode 100644 index 0000000..cfa742d --- /dev/null +++ b/plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb @@ -0,0 +1,2 @@ + +Person: <%= person.name %> diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/communities.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/communities.html.erb deleted file mode 100644 index 4fb51b0..0000000 --- a/plugins/elasticsearch/views/elasticsearch_plugin/communities.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -