jro_apps/redmine Commit - r95:3e28dc669b01

various eager loadings added...

Jean-Philippe Lang -

r95:3e28dc669b01

parent child

Context file:

r95:3e28dc669b01

Collapse all files

app/controllers/application.rb +1 -1

                def logged_in_user
                  if session[:user_id]
-                   @logged_in_user ||= User.find(session[:user_id], :include => :memberships)
+                   @logged_in_user ||= User.find(session[:user_id])
                  else
                    nil
                  end

app/controllers/projects_controller.rb +4 -4

                # Show documents list of @project
                def list_documents
-                 @documents = @project.documents
+                 @documents = @project.documents.find :all, :include => :category
                end
                # Add a new issue to @project
                  end
                  unless params[:show_news] == "0"
-                   @project.news.find(:all, :conditions => ["news.created_on>=? and news.created_on<=?", @date_from, @date_to] ).each { |i|
+                   @project.news.find(:all, :conditions => ["news.created_on>=? and news.created_on<=?", @date_from, @date_to], :include => :author ).each { |i|
                      @events_by_day[i.created_on.to_date] ||= []
                      @events_by_day[i.created_on.to_date] << i
                    }
                  end
                  unless params[:show_files] == "0"
-                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to] ).each { |i|
+                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                      @events_by_day[i.created_on.to_date] ||= []
                      @events_by_day[i.created_on.to_date] << i
                    }
                      @events_by_day[i.created_on.to_date] ||= []
                      @events_by_day[i.created_on.to_date] << i
                    }
-                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to] ).each { |i|
+                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                      @events_by_day[i.created_on.to_date] ||= []
                      @events_by_day[i.created_on.to_date] << i
                    }

app/models/project.rb +1 -1

                has_many :members, :dependent => true
                has_many :users, :through => :members
                has_many :custom_values, :dependent => true, :as => :customized
-               has_many :issues, :dependent => true, :order => "issues.created_on DESC", :include => :status
+               has_many :issues, :dependent => true, :order => "issues.created_on DESC", :include => [:status, :tracker]
                has_many :queries, :dependent => true
                has_many :documents, :dependent => true
                has_many :news, :dependent => true, :include => :author

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages