Download as
Browse Code »

Commit 19bc7ee155e0477e790dc93f608c6b98dfb2f6a4

Authored by Rodrigo Souto
1 parent 3465dd97
Exists in master and in 27 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, temp_ratings, 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,11 +15,11 @@ class RecentDocumentsBlock < Block
15 settings_items :limit, :type => :integer, :default => 5 15 settings_items :limit, :type => :integer, :default => 5
16 16
17 def content(args={}) 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 title = self.title 19 title = self.title
20 proc do 20 proc do
21 block_title(title) + 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 end 23 end
24 end 24 end
25 25