Download as
Browse Code »

Commit 8f3d6b313cd2d8d5a2071b38f4735b40dbb5a9c6

Authored by Rodrigo Souto
1 parent 4bbfef7e
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

file-presenter: do not wrap Articles that are not files 

This check is redundant but speeds up blog_page.

ActionItem3201
Showing 2 changed files with 5 additions and 3 deletions   Show diff stats
app/helpers/blog_helper.rb
  Diff comments   View file @8f3d6b3
@@ -45,9 +45,9 @@ module BlogHelper @@ -45,9 +45,9 @@ module BlogHelper
45 45
46 def display_post(article, format = 'full') 46 def display_post(article, format = 'full')
47 no_comments = (format == 'full') ? false : true 47 no_comments = (format == 'full') ? false : true
  48 + title = article_title(article, :no_comments => no_comments)
48 html = send("display_#{format}_format", FilePresenter.for(article)).html_safe 49 html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
49 -  
50 - article_title(article, :no_comments => no_comments) + html 50 + title + html
51 end 51 end
52 52
53 def display_full_format(article) 53 def display_full_format(article)
lib/file_presenter.rb
  Diff comments   View file @8f3d6b3
@@ -6,7 +6,9 @@ class FilePresenter @@ -6,7 +6,9 @@ class FilePresenter
6 # one accepts it. That behave allow to give any model to this class, 6 # one accepts it. That behave allow to give any model to this class,
7 # like a Article and have no trouble with that. 7 # like a Article and have no trouble with that.
8 def self.for(f) 8 def self.for(f)
9 - return f if f.is_a? FilePresenter 9 + #FIXME This check after the || is redundant but increases the blog_page
  10 + # speed considerably.
  11 + return f if f.is_a?(FilePresenter ) || (!f.kind_of?(UploadedFile) && !f.kind_of?(Image))
10 klass = FilePresenter.subclasses.sort_by {|class_name| 12 klass = FilePresenter.subclasses.sort_by {|class_name|
11 class_name.constantize.accepts?(f) || 0 13 class_name.constantize.accepts?(f) || 0
12 }.last.constantize 14 }.last.constantize