enju_circulation 0.0.59 → 0.0.60

data/app/controllers/checkouts_controller.rb

@@ -3,7 +3,7 @@ class CheckoutsController < ApplicationController
   load_and_authorize_resource :except => [:index, :remove_all]
   authorize_resource :only => [:index, :remove_all]
   before_filter :get_user, :only => [:index, :remove_all]
-  helper_method :get_item
+  before_filter :get_item, :only => :index
   after_filter :convert_charset, :only => :index
   cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
 
@@ -35,15 +35,19 @@ class CheckoutsController < ApplicationController
         if @user
           @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]
-              date = params[:days_overdue].to_i.days.ago.beginning_of_day
+          if @item
+            @checkouts = @item.checkouts.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
+          else
+            if params[:view] == 'overdue'
+              if params[:days_overdue]
+                date = params[:days_overdue].to_i.days.ago.beginning_of_day
+              else
+                date = 1.days.ago.beginning_of_day
+              end
+              @checkouts = Checkout.overdue(date).order('checkouts.id DESC').page(params[:page]).per_page(per_page)
             else
-              date = 1.days.ago.beginning_of_day
+              @checkouts = Checkout.not_returned.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
             end
-            @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]).per_page(per_page)
           end
         end
       else

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

@@ -0,0 +1,29 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checkout')) -%></h1>
+<div id="content_list">
+  <p id="notice"><%= notice %></p>
+
+  <h2><%= link_to item.item_identifier, item %></h2>
+  <p>(<%= link_to item.manifestation.original_title, item.manifestation %>)
+
+<%= render 'list' -%>
+
+<%- if @checkouts.size == 0 -%>
+  <p><%= t('checkout.no_checkout') -%></p>
+<%- end -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li>
+      <%= link_to 'RSS', item_checkouts_path(item, :format => :rss) -%>
+      <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), item_checkouts_path(item, :format => :rss) -%>
+    </li>
+    <li>
+      <%= link_to 'CSV', item_checkouts_path(item, :format => :csv, :locale => @locale.to_s) -%>
+      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), item_checkouts_path(item, :format => :csv, :locale => @locale.to_s) -%>
+    </li>
+  </ul>
+</div>

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

@@ -1,11 +1,19 @@
-<%- if @user -%>
-  <%= render 'index_user', :user => @user -%>
-<%- elsif !current_user.has_role?('Librarian') -%>
-  <%= render 'index_user', :user => current_user -%>
-<%- else -%>
+<%- if current_user.has_role?('Librarian') -%>
+  <%- if @user -%>
+    <%= render 'index_user', :user => @user -%>
+  <% elsif @item %>
+    <%= render 'index_item', :item => @item -%>
+  <% else %>
+    <%- if params[:view] == 'overdue' -%>
+      <%= render 'index_overdue' -%>
+    <%- else -%>
+      <%= render 'index' -%>
+    <% end %>
+  <% end %>
+<% else %>
   <%- if params[:view] == 'overdue' -%>
     <%= render 'index_overdue' -%>
   <%- else -%>
-    <%= render 'index' -%>
+    <%= render 'index_user', :user => current_user -%>
   <%- end -%>
 <%- end -%>

data/config/routes.rb

@@ -34,6 +34,7 @@ Rails.application.routes.draw do
     resources :checked_items
     resources :item_has_use_restrictions
     resources :lending_policies
+    resources :checkouts
   end
   resources :checkout_stat_has_manifestations
   resources :checkout_stat_has_users

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.59"
+  VERSION = "0.0.60"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -64,6 +64,12 @@ describe CheckoutsController do
         response.should be_success
         assigns(:checkouts).should eq users(:admin).checkouts.not_returned.order('checkouts.id DESC').page(1)
       end
+
+      it "should get index with item_id" do
+        get :index, :item_id => 1
+        response.should be_success
+        assigns(:checkouts).should eq items(:item_00001).checkouts.order('checkouts.id DESC').page(1)
+      end
     end
 
     describe "When logged in as User" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -408,6 +408,7 @@ files:
 - app/views/checkout_types/show.html.erb
 - app/views/checkouts/_form.html.erb
 - app/views/checkouts/_index.html.erb
+- app/views/checkouts/_index_item.html.erb
 - app/views/checkouts/_index_overdue.html.erb
 - app/views/checkouts/_index_user.html.erb
 - app/views/checkouts/_list.html.erb