Download as
Browse Code »

Commit bccf7c4265edfe8fc3b309359bcc396ab1d6aeae

Authored by Aurelio A. Heckert
1 parent f13dcf68
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem690: recent content block do not lists private articles. finaly.

Showing 2 changed files with 49 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @bccf7c4
@@ -77,7 +77,23 @@ class Article < ActiveRecord::Base @@ -77,7 +77,23 @@ class Article < ActiveRecord::Base
77 # 77 #
78 # Only includes articles where advertise == true 78 # Only includes articles where advertise == true
79 def self.recent(limit) 79 def self.recent(limit)
80 - options = { :limit => limit, :conditions => { :advertise => true, :public_article => true }, :order => 'created_at desc, articles.id desc' } 80 + # FIXME this method is a horrible hack
  81 + options = { :limit => limit,
  82 + :conditions => {
  83 + :advertise => true,
  84 + :public_article => true,
  85 + :published => true,
  86 + 'profiles.public_profile' => true
  87 + },
  88 + :include => 'profile',
  89 + :order => 'articles.created_at desc, articles.id desc'
  90 + }
  91 + if ( scoped_methods && scoped_methods.last &&
  92 + scoped_methods.last[:find] &&
  93 + scoped_methods.last[:find][:joins] &&
  94 + scoped_methods.last[:find][:joins].index('profiles') )
  95 + options.delete(:include)
  96 + end
81 self.find(:all, options) 97 self.find(:all, options)
82 end 98 end
83 99
test/unit/article_test.rb
  Diff comments   View file @bccf7c4
@@ -137,6 +137,38 @@ class ArticleTest < Test::Unit::TestCase @@ -137,6 +137,38 @@ class ArticleTest < Test::Unit::TestCase
137 assert_equal [other_first, fifth, fourth, third, second, first], Article.recent(6) 137 assert_equal [other_first, fifth, fourth, third, second, first], Article.recent(6)
138 end 138 end
139 139
  140 + should 'not show private documents as recent' do
  141 + p = create_user('usr1').person
  142 + Article.destroy_all
  143 +
  144 + first = p.articles.build(:name => 'first', :public_article => true); first.save!
  145 + second = p.articles.build(:name => 'second', :public_article => false); second.save!
  146 +
  147 + assert_equal [ first ], Article.recent(nil)
  148 + end
  149 +
  150 + should 'not show unpublished documents as recent' do
  151 + p = create_user('usr1').person
  152 + Article.destroy_all
  153 +
  154 + first = p.articles.build(:name => 'first', :published => true); first.save!
  155 + second = p.articles.build(:name => 'second', :published => false); second.save!
  156 +
  157 + assert_equal [ first ], Article.recent(nil)
  158 + end
  159 +
  160 + should 'not show documents from a private profile as recent' do
  161 + p = create_user('usr1').person
  162 + p.public_profile = false
  163 + p.save!
  164 + Article.destroy_all
  165 +
  166 + first = p.articles.build(:name => 'first', :published => true); first.save!
  167 + second = p.articles.build(:name => 'second', :published => false); second.save!
  168 +
  169 + assert_equal [ ], Article.recent(nil)
  170 + end
  171 +
140 should 'require that subclasses define description' do 172 should 'require that subclasses define description' do
141 assert_raise NotImplementedError do 173 assert_raise NotImplementedError do
142 Article.description 174 Article.description