[Git][noosfero/noosfero][master] 2 commits: pg-search: fix warnings

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
133d174e by Rodrigo Souto at 2018-01-22T11:26:22-03:00
pg-search: fix warnings

- - - - -
8123330e by Rodrigo Souto at 2018-01-29T14:52:13+00:00
Merge branch 'fix-pg-search-warnings' into 'master'

pg-search: fix warnings

See merge request noosfero/noosfero!1378
- - - - -


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
@@ -23,7 +23,13 @@ Article.class_eval do
     end
   end
 
-  PgSearchPlugin::Filters = { :tag => :tags }
-  PgSearchPlugin::CategoryFilters = { category: 'articles_categories', region: 'articles_categories' }
+  def self.pg_search_plugin_filters
+    { :tag => :tags }
+  end
+
+  def self.pg_search_plugin_category_filters
+    { category: 'articles_categories', region: 'articles_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,8 +2,14 @@ require_dependency 'profile'
 require_dependency 'pg_search_plugin/search_filters'
 
 Profile.class_eval do
-  PgSearchPlugin::Filters = { :tag => :tags, :kind => :kinds }
-  PgSearchPlugin::CategoryFilters = { category: 'categories_profiles', region: 'categories_profiles' }
+  def self.pg_search_plugin_filters
+    { :tag => :tags, :kind => :kinds }
+  end
+
+  def self.pg_search_plugin_category_filters
+    { category: 'categories_profiles', region: 'categories_profiles' }
+  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,7 @@
 require 'noosfero/friendly_mime'
 
 class PgSearchPlugin < Noosfero::Plugin
-  include PgSearchPlugin::SearchHelper
+  include SearchHelper
 
   def self.plugin_name
     "Postgres Full-Text Search"


=====================================
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)
@@ -11,7 +11,7 @@ module PgSearchPlugin::SearchFilters
       }
     end
 
-    PgSearchPlugin::CategoryFilters.each do |name, relation_table|
+    pg_search_plugin_category_filters.each do |name, relation_table|
       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/compare/a64ae9100f4cde07e9b06c3302904cd62fea719e...8123330e8f4335287d1c5d5c6f7210f9d5529070

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/a64ae9100f4cde07e9b06c3302904cd62fea719e...8123330e8f4335287d1c5d5c6f7210f9d5529070
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/20180129/ca837ac3/attachment-0001.html>