Download as
Browse Code »

Commit 4e35d6fc9ca1735ed4c8caee5d90942d848feb9d

Authored by Antonio Terceiro
1 parent 1c0fe316
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem927: not listing blogs as recent content

Showing 2 changed files with 10 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @4e35d6f
@@ -102,7 +102,7 @@ class Article < ActiveRecord::Base @@ -102,7 +102,7 @@ class Article < ActiveRecord::Base
102 public_article = ? AND 102 public_article = ? AND
103 published = ? AND 103 published = ? AND
104 profiles.public_profile = ? AND 104 profiles.public_profile = ? AND
105 - ((articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed' 105 + ((articles.type != ? and articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed', 'Blog'
106 ], 106 ],
107 :include => 'profile', 107 :include => 'profile',
108 :order => 'articles.updated_at desc, articles.id desc' 108 :order => 'articles.updated_at desc, articles.id desc'
test/unit/article_test.rb
  Diff comments   View file @4e35d6f
@@ -217,6 +217,15 @@ class ArticleTest < Test::Unit::TestCase @@ -217,6 +217,15 @@ class ArticleTest < Test::Unit::TestCase
217 assert_equal [ second ], Article.recent(nil) 217 assert_equal [ second ], Article.recent(nil)
218 end 218 end
219 219
  220 + should 'not show blog as recent' do
  221 + p = create_user('usr1').person
  222 + Article.destroy_all
  223 + first = Blog.create!(:profile => p, :name => 'my blog', :advertise => true)
  224 + second = p.articles.build(:name => 'second'); second.save!
  225 +
  226 + assert_equal [ second ], Article.recent(nil)
  227 + end
  228 +
220 should 'require that subclasses define description' do 229 should 'require that subclasses define description' do
221 assert_raise NotImplementedError do 230 assert_raise NotImplementedError do
222 Article.description 231 Article.description