From 6b366ef4472ce38266f7c4d7c71fd235f73168c5 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Fri, 24 Jul 2015 18:18:22 -0300 Subject: [PATCH] rails4: move to is_public scope --- plugins/event/lib/event_plugin/event_block.rb | 2 +- plugins/profile_members_headlines/lib/profile_members_headlines_block.rb | 2 +- plugins/solr/test/unit/solr_plugin/plugin_test.rb | 2 +- plugins/stoa/lib/stoa_plugin/person_api.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/event/lib/event_plugin/event_block.rb b/plugins/event/lib/event_plugin/event_block.rb index 5b1c531..f8bcbe6 100644 --- a/plugins/event/lib/event_plugin/event_block.rb +++ b/plugins/event/lib/event_plugin/event_block.rb @@ -27,7 +27,7 @@ class EventPlugin::EventBlock < Block def events(user = nil) events = events_source.events.order('start_date') - events = user.nil? ? events.public : events.display_filter(user,nil) + events = user.nil? ? events.is_public : events.display_filter(user,nil) if future_only events = events.where('start_date >= ?', Date.today) diff --git a/plugins/profile_members_headlines/lib/profile_members_headlines_block.rb b/plugins/profile_members_headlines/lib/profile_members_headlines_block.rb index 2f01b05..3ba31dc 100644 --- a/plugins/profile_members_headlines/lib/profile_members_headlines_block.rb +++ b/plugins/profile_members_headlines/lib/profile_members_headlines_block.rb @@ -26,7 +26,7 @@ class ProfileMembersHeadlinesBlock < Block end def authors_list - result = owner.members_by_role(filtered_roles).public.includes([:image,:domains,:preferred_domain,:environment]).order('updated_at DESC') + result = owner.members_by_role(filtered_roles).is_public.includes([:image,:domains,:preferred_domain,:environment]).order('updated_at DESC') result.all(:limit => limit * 5).select { |p| p.has_headline? }.slice(0..limit-1) diff --git a/plugins/solr/test/unit/solr_plugin/plugin_test.rb b/plugins/solr/test/unit/solr_plugin/plugin_test.rb index 5454c50..5ff958a 100644 --- a/plugins/solr/test/unit/solr_plugin/plugin_test.rb +++ b/plugins/solr/test/unit/solr_plugin/plugin_test.rb @@ -9,7 +9,7 @@ class SolrPlugin::PluginTest < ActiveSupport::TestCase should 'convert scopes to solr filters' do person = create_user('test').person - result = plugin.send :scopes_to_solr_filters, person.files.public.published + result = plugin.send :scopes_to_solr_filters, person.files.is_public.published assert_equal result, ["profile_id:#{person.id}", "published:'true'", "solr_plugin_public:true"] end diff --git a/plugins/stoa/lib/stoa_plugin/person_api.rb b/plugins/stoa/lib/stoa_plugin/person_api.rb index 56312e1..fa044fc 100644 --- a/plugins/stoa/lib/stoa_plugin/person_api.rb +++ b/plugins/stoa/lib/stoa_plugin/person_api.rb @@ -35,7 +35,7 @@ class StoaPlugin::PersonApi < Noosfero::FieldsDecorator end def communities - object.communities.public.map {|community| {:url => profile_homepage(context, community), :name => community.name}} + object.communities.is_public.map {|community| {:url => profile_homepage(context, community), :name => community.name}} end private -- libgit2 0.21.2