Download as
Browse Code »

Commit 043b4c321c704d686fef80f1d54e83e7c19397b9

Authored by Rodrigo Souto
1 parent 7798223b
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

Fixing memory overload on blog with native translation feature 

(ActionItem2471)
Showing 1 changed file with 9 additions and 3 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @043b4c3
@@ -79,11 +79,17 @@ class ContentViewerController < ApplicationController @@ -79,11 +79,17 @@ class ContentViewerController < ApplicationController
79 @page.posts 79 @page.posts
80 end 80 end
81 81
82 - if @page.blog? && @page.display_posts_in_current_language?  
83 - posts = posts.native_translations.all(Article.display_filter(user, profile)).map{ |p| p.get_translation_to(FastGettext.locale) }.compact  
84 - end 82 + #FIXME Need to run this before the pagination because this version of
  83 + # will_paginate returns a will_paginate collection instead of a
  84 + # relation.
  85 + blog_with_translation = @page.blog? && @page.display_posts_in_current_language?
  86 + posts = posts.native_translations if blog_with_translation
85 87
86 @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))) 88 @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile)))
  89 +
  90 + if blog_with_translation
  91 + @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
  92 + end
87 end 93 end
88 94
89 if @page.folder? && @page.gallery? 95 if @page.folder? && @page.gallery?