Download as
Browse Code »

Commit 197f3c6b5b396f58d270cc5c025537ac4cfc6be5

Authored by Larissa Reis
Committed by Daniela Feitosa
1 parent 44297261
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

Makes faster db consult for users list download 

  * In app/controller/admin/users_controller.rb uses a User.find() method call that uses a :include argument to load the needed Persons with a single sql instead of one sql consult per user.
  * Only call User.find() if the format is csv or xml, to avoid making the
huge sql consult every time the user loads the page.

  * With this change, the downloading time of a users list on csv format
decreased 63%, while on xml format decreased 30%.
  * I've got no guarantee it's enough time to avoid timeout in production
server, though.
  * Not tested on debian.

(ActionItem2241)
Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
app/controllers/admin/users_controller.rb
  Diff comments   View file @197f3c6
@@ -3,10 +3,10 @@ class UsersController < AdminController @@ -3,10 +3,10 @@ class UsersController < AdminController
3 protect 'manage_environment_users', :environment 3 protect 'manage_environment_users', :environment
4 4
5 def index 5 def index
6 - @users = environment.users  
7 respond_to do |format| 6 respond_to do |format|
8 format.html 7 format.html
9 format.xml do 8 format.xml do
  9 + @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
10 render :xml => @users.to_xml( 10 render :xml => @users.to_xml(
11 :skip_types => true, 11 :skip_types => true,
12 :only => %w[email login created_at updated_at], 12 :only => %w[email login created_at updated_at],
@@ -14,6 +14,7 @@ class UsersController < AdminController @@ -14,6 +14,7 @@ class UsersController < AdminController
14 ) 14 )
15 end 15 end
16 format.csv do 16 format.csv do
  17 + @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
17 render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false 18 render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
18 end 19 end
19 end 20 end