app/controllers/searches_controller.rb in artfully_ose-1.2.0.pre.15 vs app/controllers/searches_controller.rb in artfully_ose-1.2.0.pre.16

@@ -24,13 +24,13 @@
     @segment = Segment.new
     @membership_types = MembershipType.all
     session[:return_to] ||= request.referer # Record the current page, in case creating a list segment fails.
     prepare_search_and_people
     respond_to do |format|
-     format.html
-     format.csv { render :csv => @search.people, :filename => "#{@search.id}-#{DateTime.now.strftime("%m-%d-%y")}" }
-   end
+      format.html { @people = @people.paginate(:page => params[:page], :per_page => 20) }
+      format.csv  { render :csv => Person.where(:id => @people.collect(&:id)).includes(:phones, :address, :tags).order('lower(people.last_name)'), :filename => "#{@search.id}-#{DateTime.now.strftime("%m-%d-%y")}" }
+    end
   end
 
   def tag
     @search = Search.find(params[:id])
     authorize! :tag, Segment
@@ -42,10 +42,9 @@
   private
 
     def prepare_search_and_people
       @event_options = Event.options_for_select_by_organization(@current_user.current_organization)
       @people = @search.people
-      @people = @people.paginate(:page => params[:page], :per_page => 20)
     end
 
     def load_discount_codes
       @discount_codes = Discount.where(:organization_id => current_user.current_organization).all.map(&:code)
       @discount_codes << Discount::ALL_DISCOUNTS_STRING