You are viewing a plain text version of this content. The canonical link for it is here.
Posted to olio-commits@incubator.apache.org by ws...@apache.org on 2009/02/26 20:51:38 UTC
svn commit: r748295 -
/incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb
Author: wsobel
Date: Thu Feb 26 20:51:37 2009
New Revision: 748295
URL: http://svn.apache.org/viewvc?rev=748295&view=rev
Log:
Fix for OLIO-57: (Amanda Waite) Removed :include => address to in event pagination. Seems to be causing the database issues when at scale.
Modified:
incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb
Modified: incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb?rev=748295&r1=748294&r2=748295&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb (original)
+++ incubator/olio/webapp/rails/trunk/app/controllers/events_controller.rb Thu Feb 26 20:51:37 2009
@@ -29,7 +29,7 @@
session[:order] = params[:order] || session[:order] || 'event_date'
- @events = Event.paginate :page => params[:page], :conditions => conditions, :order => session[:order], :per_page => 10, :include => :address
+ @events = Event.paginate :page => params[:page], :conditions => conditions, :order => session[:order], :per_page => 10
if @zipcode and !@zipcode.empty?
@events.delete_if { |e| e.address.zip != @zipcode }
end