Download as
Browse Code »

Commit 4659d2722b4d782cdcd03a73acc1adea5b043c93

Authored by AntonioTerceiro
1 parent 01efec8c
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

ActionItem194: fixing the fix 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1708 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @4659d27
@@ -32,8 +32,10 @@ class Article < ActiveRecord::Base @@ -32,8 +32,10 @@ class Article < ActiveRecord::Base
32 32
33 # retrieves the latest +limit+ articles, sorted from the most recent to the 33 # retrieves the latest +limit+ articles, sorted from the most recent to the
34 # oldest. 34 # oldest.
  35 + #
  36 + # Only includes articles where advertise == true
35 def self.recent(limit) 37 def self.recent(limit)
36 - options = { :limit => limit, :order => 'created_at desc, articles.id desc' } 38 + options = { :limit => limit, :conditions => { :advertise => true }, :order => 'created_at desc, articles.id desc' }
37 self.find(:all, options) 39 self.find(:all, options)
38 end 40 end
39 41
app/models/recent_documents_block.rb
  Diff comments   View file @4659d27
@@ -10,8 +10,6 @@ class RecentDocumentsBlock < Block @@ -10,8 +10,6 @@ class RecentDocumentsBlock < Block
10 def content 10 def content
11 docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit) 11 docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit)
12 12
13 - docs.delete_if{|d| d.kind_of?(Article) and !d.advertise?}  
14 -  
15 block_title(_('Recent content')) + 13 block_title(_('Recent content')) +
16 content_tag('ul', docs.map {|item| content_tag('li', link_to(item.title, item.url))}.join("\n")) 14 content_tag('ul', docs.map {|item| content_tag('li', link_to(item.title, item.url))}.join("\n"))
17 15