Download as
Browse Code »

Commit 01efcccd9baf5e277cafa6b4d360c72750164742

Authored by Leandro Santos
2 parents 15b2009b f052db05
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

Merge branch 'rails3' of gitlab.com:participa/noosfero into rails3

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
plugins/display_content/lib/display_content_block.rb
  Diff comments   View file @01efccc
... ... @@ -120,7 +120,7 @@ class DisplayContentBlock < Block
120 120 nodes_conditions = nodes.blank? ? '' : " AND articles.id IN(:nodes) "
121 121 nodes_conditions += ' OR articles.parent_id IN(:nodes) ' if !nodes.blank? && display_folder_children
122 122  
123   - docs = owner.articles.find(:all, :conditions => ["articles.type IN(:types) #{nodes.blank? ? '' : nodes_conditions}", {:nodes => self.nodes, :types => self.types}])
  123 + docs = owner.articles.find(:all, :conditions => ["articles.type IN(:types) #{nodes.blank? ? '' : nodes_conditions}", {:nodes => self.nodes, :types => self.types}], :include => :profile)
124 124 proc do
125 125 block.block_title(block.title) +
126 126 content_tag('ul', docs.map {|item|
... ...