[Git][noosfero/noosfero][stable-1.10] pg-search: fix includes and warnings

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.10 at Noosfero / noosfero


Commits:
9f27469f by Rodrigo Souto at 2018-03-26T15:00:32Z
pg-search: fix includes and warnings

- - - - -


4 changed files:

- plugins/pg_search/lib/ext/article.rb
- plugins/pg_search/lib/ext/profile.rb
- plugins/pg_search/lib/pg_search_plugin.rb
- plugins/pg_search/lib/pg_search_plugin/search_filters.rb


Changes:

=====================================
plugins/pg_search/lib/ext/article.rb
=====================================
--- a/plugins/pg_search/lib/ext/article.rb
+++ b/plugins/pg_search/lib/ext/article.rb
@@ -21,6 +21,8 @@ Article.class_eval do
     end
   end
 
-  PgSearchPlugin::Filters = {:tag => :tags, :category => :categories}
+  def self.pg_search_plugin_filters
+    {:tag => :tags, :category => :categories}
+  end
   include PgSearchPlugin::SearchFilters
 end


=====================================
plugins/pg_search/lib/ext/profile.rb
=====================================
--- a/plugins/pg_search/lib/ext/profile.rb
+++ b/plugins/pg_search/lib/ext/profile.rb
@@ -2,7 +2,9 @@ require_dependency 'profile'
 require_dependency 'pg_search_plugin/search_filters'
 
 Profile.class_eval do
-  PgSearchPlugin::Filters = {:tag => :tags, :category => :categories, :region => :categories, :kind => :kinds}
+  def self.pg_search_plugin_filters
+    {:tag => :tags, :category => :categories, :region => :categories, :kind => :kinds}
+  end
+
   include PgSearchPlugin::SearchFilters
 end
-


=====================================
plugins/pg_search/lib/pg_search_plugin.rb
=====================================
--- a/plugins/pg_search/lib/pg_search_plugin.rb
+++ b/plugins/pg_search/lib/pg_search_plugin.rb
@@ -1,7 +1,6 @@
 require 'noosfero/friendly_mime'
 
 class PgSearchPlugin < Noosfero::Plugin
-  include PgSearchPlugin::SearchHelper
 
   def self.plugin_name
     "Postgres Full-Text Search"
@@ -309,3 +308,6 @@ class PgSearchPlugin < Noosfero::Plugin
     _('Tags')
   end
 end
+
+require_dependency 'pg_search_plugin/search_helper'
+PgSearchPlugin.include(PgSearchPlugin::SearchHelper)


=====================================
plugins/pg_search/lib/pg_search_plugin/search_filters.rb
=====================================
--- a/plugins/pg_search/lib/pg_search_plugin/search_filters.rb
+++ b/plugins/pg_search/lib/pg_search_plugin/search_filters.rb
@@ -3,7 +3,7 @@ require 'active_support/concern'
 module PgSearchPlugin::SearchFilters
   extend ActiveSupport::Concern
   included do
-    PgSearchPlugin::Filters.each do |name, table_name|
+    pg_search_plugin_filters.each do |name, table_name|
       scope "pg_search_plugin_by_#{name}", -> id {
         select("#{self.table_name}.id").
         joins(name.to_s.pluralize.to_sym).



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/9f27469f1466fb2d2c35ffe21ac86a908a52058c

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/9f27469f1466fb2d2c35ffe21ac86a908a52058c
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180326/e08ddd91/attachment-0001.html>