diff --git a/app/models/article.rb b/app/models/article.rb index 5ec6cab..08fd31c 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -32,8 +32,10 @@ class Article < ActiveRecord::Base # retrieves the latest +limit+ articles, sorted from the most recent to the # oldest. + # + # Only includes articles where advertise == true def self.recent(limit) - options = { :limit => limit, :order => 'created_at desc, articles.id desc' } + options = { :limit => limit, :conditions => { :advertise => true }, :order => 'created_at desc, articles.id desc' } self.find(:all, options) end diff --git a/app/models/recent_documents_block.rb b/app/models/recent_documents_block.rb index 6ffe667..aed4727 100644 --- a/app/models/recent_documents_block.rb +++ b/app/models/recent_documents_block.rb @@ -10,8 +10,6 @@ class RecentDocumentsBlock < Block def content docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit) - docs.delete_if{|d| d.kind_of?(Article) and !d.advertise?} - block_title(_('Recent content')) + content_tag('ul', docs.map {|item| content_tag('li', link_to(item.title, item.url))}.join("\n")) -- libgit2 0.21.2