Download as
Browse Code »

Commit 19bc7ee155e0477e790dc93f608c6b98dfb2f6a4

Authored by Rodrigo Souto
1 parent 3465dd97
Exists in master and in 22 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, template_mirror_block, tests, tests_fixies

rails3: fix merge problem on recent_documents

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/models/recent_documents_block.rb
  Diff comments   View file @19bc7ee
... ... @@ -15,11 +15,11 @@ class RecentDocumentsBlock < Block
15 15 settings_items :limit, :type => :integer, :default => 5
16 16  
17 17 def content(args={})
18   - docs = self.docs
  18 + docs = self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.limit, {}, false)
19 19 title = self.title
20 20 proc do
21 21 block_title(title) +
22   - content_tag('ul', docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
  22 + content_tag('ul', docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
23 23 end
24 24 end
25 25  
... ...