Download as
Browse Code »

Commit e833fc77060d5f80d0827677a472bb8949d40e9f

Authored by Leandro Santos
1 parent 1a1eab27
Exists in master and in 16 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_pagination, api_private_token, article_hit_count, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_user_email_validation, notification_plugin, notification_plugin_rebase, split_by_role

refactoring display_filter to filter all article of friends marked as show_to_followers

Showing 6 changed files with 22 additions and 8 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @e833fc7
@@ -504,9 +504,9 @@ class Article < ActiveRecord::Base @@ -504,9 +504,9 @@ class Article < ActiveRecord::Base
504 where( 504 where(
505 [ 505 [
506 "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ? 506 "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ?
507 - OR (show_to_followers = ? AND ? AND profile_id = ?)", true, user.id, user.id, 507 + OR (show_to_followers = ? AND ? AND profile_id IN (?))", true, user.id, user.id,
508 profile.nil? ? false : user.has_permission?(:view_private_content, profile), 508 profile.nil? ? false : user.has_permission?(:view_private_content, profile),
509 - true, user.follows?(profile), (profile.nil? ? nil : profile.id) 509 + true, (profile.nil? ? true : user.follows?(profile)), ( profile.nil? ? (user.friends.select('profiles.id')) : [profile.id])
510 ] 510 ]
511 ) 511 )
512 } 512 }
plugins/event/lib/event_plugin/event_block.rb
  Diff comments   View file @e833fc7
@@ -26,8 +26,8 @@ class EventPlugin::EventBlock < Block @@ -26,8 +26,8 @@ class EventPlugin::EventBlock < Block
26 end 26 end
27 27
28 def events(user = nil) 28 def events(user = nil)
29 - events = events_source.events  
30 - events = events.published.order('start_date') 29 + events = events_source.events.order('start_date')
  30 + events = user.nil? ? events.public : events.display_filter(user,nil)
31 31
32 if future_only 32 if future_only
33 events = events.where('start_date >= ?', Date.today) 33 events = events.where('start_date >= ?', Date.today)
plugins/event/test/test_helper.rb 0 → 100644
  Diff comments   View file @e833fc7
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +require_relative '../../../test/test_helper'
plugins/event/test/unit/event_block_test.rb
  Diff comments   View file @e833fc7
1 -require File.dirname(__FILE__) + '/../../../../test/test_helper' 1 +require_relative '../test_helper'
2 2
3 -class EventPlugin::EventBlockTest < ActiveSupport::TestCase 3 +class EventBlockTest < ActiveSupport::TestCase
4 4
5 def setup 5 def setup
6 @env = Environment.default 6 @env = Environment.default
@@ -165,7 +165,7 @@ class EventPlugin::EventBlockTest &lt; ActiveSupport::TestCase @@ -165,7 +165,7 @@ class EventPlugin::EventBlockTest &lt; ActiveSupport::TestCase
165 165
166 def visibility_content_test_from_a_profile(profile) 166 def visibility_content_test_from_a_profile(profile)
167 @block.box.owner = @env 167 @block.box.owner = @env
168 - ev = fast_create Event, :name => '2 de Julho', :profile_id => profile.id 168 + ev = Event.create!(:name => '2 de Julho', :profile => profile)
169 @block.all_env_events = true 169 @block.all_env_events = true
170 170
171 # Do not list event from private profile for non logged visitor 171 # Do not list event from private profile for non logged visitor
plugins/event/test/unit/event_plugin_test.rb
  Diff comments   View file @e833fc7
1 -require File.dirname(__FILE__) + '/../../../../test/test_helper' 1 +require_relative '../test_helper'
2 2
3 class EventPluginTest < ActiveSupport::TestCase 3 class EventPluginTest < ActiveSupport::TestCase
4 4
test/unit/article_test.rb
  Diff comments   View file @e833fc7
@@ -1970,6 +1970,19 @@ class ArticleTest &lt; ActiveSupport::TestCase @@ -1970,6 +1970,19 @@ class ArticleTest &lt; ActiveSupport::TestCase
1970 assert_equal [a], Article.display_filter(user, p) 1970 assert_equal [a], Article.display_filter(user, p)
1971 end 1971 end
1972 1972
  1973 + should 'display_filter show person private content to friends when no profile is passed as parameter' do
  1974 + user = create_user('someuser').person
  1975 + p = fast_create(Person)
  1976 + user.add_friend(p)
  1977 + user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
  1978 + Article.delete_all
  1979 + a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
  1980 + fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
  1981 + fast_create(Article, :published => false, :show_to_followers => false, :profile_id => p.id)
  1982 + assert_equal [a], Article.display_filter(user, nil)
  1983 + end
  1984 +
  1985 +
1973 should 'display_filter show community private content to members' do 1986 should 'display_filter show community private content to members' do
1974 user = create_user('someuser').person 1987 user = create_user('someuser').person
1975 p = fast_create(Community) 1988 p = fast_create(Community)