Download as
Browse Code »

Commit 043b4c321c704d686fef80f1d54e83e7c19397b9

Authored by Rodrigo Souto
1 parent 7798223b
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

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?