enju_circulation 0.0.51 → 0.0.52

data/app/controllers/checkouts_controller.rb

@@ -16,7 +16,7 @@ class CheckoutsController < ApplicationController
       if icalendar_user.blank?
         raise ActiveRecord::RecordNotFound
       else
-        checkouts = icalendar_user.checkouts.not_returned.order('checkouts.id DESC')
+        @checkouts = icalendar_user.checkouts.not_returned.order('checkouts.id DESC')
       end
     else
       unless current_user
@@ -24,10 +24,16 @@ class CheckoutsController < ApplicationController
       end
     end
 
+    if params[:format] == 'csv'
+      per_page = 65534
+    else
+      per_page = Checkout.per_page
+    end
+
     unless icalendar_user
       if current_user.try(:has_role?, 'Librarian')
         if @user
-          checkouts = @user.checkouts.not_returned.order('checkouts.id DESC').page(params[:page])
+          @checkouts = @user.checkouts.not_returned.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
         else
           if params[:view] == 'overdue'
             if params[:days_overdue]
@@ -35,9 +41,9 @@ class CheckoutsController < ApplicationController
             else
               date = 1.days.ago.beginning_of_day
             end
-            checkouts = Checkout.overdue(date).order('checkouts.id DESC').page(params[:page])
+            @checkouts = Checkout.overdue(date).order('checkouts.id DESC').page(params[:page]).per_page(per_page)
           else
-            checkouts = Checkout.not_returned.order('checkouts.id DESC').page(params[:page])
+            @checkouts = Checkout.not_returned.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
           end
         end
       else
@@ -50,18 +56,13 @@ class CheckoutsController < ApplicationController
             access_denied
             return
           else
-            checkouts = current_user.checkouts.not_returned.order('checkouts.id DESC').page(params[:page])
+            @checkouts = current_user.checkouts.not_returned.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
           end
         end
       end
     end
 
     @days_overdue = params[:days_overdue] ||= 1
-    if params[:format] == 'csv'
-      @checkouts = checkouts
-    else
-      @checkouts = checkouts.page(params[:page])
-    end
 
     respond_to do |format|
       format.html # index.html.erb

data/app/views/checkouts/_index_user.html.erb

@@ -42,11 +42,11 @@
       </li>
     <%- else -%>
       <li>
-        <%= link_to 'RSS', checkouts_path(:format => :rss) -%>
+        <%= link_to 'RSS', user_checkouts_path(:format => :rss) -%>
         <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), user_checkouts_path(user, :format => :rss) -%>
       </li>
       <li>
-        <%= link_to 'CSV', checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
+        <%= link_to 'CSV', user_checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
         <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_checkouts_path(user, :format => :csv, :locale => @locale.to_s) -%>
       </li>
     <%- end -%>

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.51"
+  VERSION = "0.0.52"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -123,7 +123,7 @@ describe CheckoutsController do
         token = "AVRjefcBcey6f1WyYXDl"
         user = User.where(:checkout_icalendar_token => token).first
         get :index, :icalendar_token => token
-        assigns(:checkouts).should eq user.checkouts.not_returned.order('checkouts.id DESC').page(1)
+        assigns(:checkouts).should eq user.checkouts.not_returned.order('checkouts.id DESC')
         response.should be_success
       end
 
@@ -131,7 +131,7 @@ describe CheckoutsController do
         token = "AVRjefcBcey6f1WyYXDl"
         user = User.where(:checkout_icalendar_token => token).first
         get :index, :icalendar_token => token, :format => :ics
-        assigns(:checkouts).should eq user.checkouts.not_returned.order('checkouts.id DESC').page(1)
+        assigns(:checkouts).should eq user.checkouts.not_returned.order('checkouts.id DESC')
         response.should be_success
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.52
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails