app/controllers/searches_controller.rb in artfully_ose-1.2.0.pre.23 vs app/controllers/searches_controller.rb in artfully_ose-1.2.0.pre.24

- old
+ new

@@ -27,10 +27,10 @@ @pass_types = current_user.current_organization.pass_types.all session[:return_to] ||= request.referer # Record the current page, in case creating a list segment fails. prepare_form prepare_people respond_to do |format| - format.html { @people = @people.paginate(:page => params[:page], :per_page => 20) } + format.html { @people = @people.paginate(:page => params[:page], :per_page => (params[: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