[Git][noosfero/noosfero][rails4] rails4: move to is_public scope
Bráulio Bhavamitra
gitlab at gitlab.com
Fri Jul 24 18:37:17 BRT 2015
Bráulio Bhavamitra pushed to branch rails4 at Noosfero / noosfero
Commits:
6b366ef4 by Braulio Bhavamitra at 2015-07-24T18:18:22Z
rails4: move to is_public scope
- - - - -
4 changed files:
- plugins/event/lib/event_plugin/event_block.rb
- plugins/profile_members_headlines/lib/profile_members_headlines_block.rb
- plugins/solr/test/unit/solr_plugin/plugin_test.rb
- plugins/stoa/lib/stoa_plugin/person_api.rb
Changes:
=====================================
plugins/event/lib/event_plugin/event_block.rb
=====================================
--- 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)
=====================================
plugins/profile_members_headlines/lib/profile_members_headlines_block.rb
=====================================
--- 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)
=====================================
plugins/solr/test/unit/solr_plugin/plugin_test.rb
=====================================
--- 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
=====================================
plugins/stoa/lib/stoa_plugin/person_api.rb
=====================================
--- 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
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/6b366ef4472ce38266f7c4d7c71fd235f73168c5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150724/b0f9c988/attachment.html>
More information about the Noosfero-dev
mailing list