diff --git a/app/models/article.rb b/app/models/article.rb index 749df52..60e8be4 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -102,7 +102,7 @@ class Article < ActiveRecord::Base public_article = ? AND published = ? AND profiles.public_profile = ? AND - ((articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed' + ((articles.type != ? and articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed', 'Blog' ], :include => 'profile', :order => 'articles.updated_at desc, articles.id desc' diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index dbc55d6..e4b8308 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -217,6 +217,15 @@ class ArticleTest < Test::Unit::TestCase assert_equal [ second ], Article.recent(nil) end + should 'not show blog as recent' do + p = create_user('usr1').person + Article.destroy_all + first = Blog.create!(:profile => p, :name => 'my blog', :advertise => true) + second = p.articles.build(:name => 'second'); second.save! + + assert_equal [ second ], Article.recent(nil) + end + should 'require that subclasses define description' do assert_raise NotImplementedError do Article.description -- libgit2 0.21.2