enju_circulation 0.0.13 → 0.0.14

data/app/controllers/baskets_controller.rb

@@ -1,6 +1,5 @@
 class BasketsController < ApplicationController
   load_and_authorize_resource
-  helper_method :get_user
   cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
 
   # GET /baskets
@@ -57,8 +56,7 @@ class BasketsController < ApplicationController
 
     respond_to do |format|
       if @basket.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.basket'))
-        format.html { redirect_to basket_checked_items_url(@basket) }
+        format.html { redirect_to basket_checked_items_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
         format.json { render :json => @basket, :status => :created, :location => @basket }
       else
         format.html { render :action => "new" }
@@ -81,12 +79,11 @@ class BasketsController < ApplicationController
       #if @basket.update_attributes({})
       if @basket.save(:validate => false)
         # 貸出完了時
-        flash[:notice] = t('basket.checkout_completed')
-        format.html { redirect_to(user_checkouts_url(@basket.user)) }
-        format.json { head :ok }
+        format.html { redirect_to user_checkouts_url(@basket.user), :notice => t('basket.checkout_completed') }
+        format.json { head :no_content }
       else
-        format.html { redirect_to(basket_checked_items_url(@basket)) }
-        format.json { head :ok }
+        format.html { redirect_to basket_checked_items_url(@basket) }
+        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
       end
     end
 
@@ -99,8 +96,8 @@ class BasketsController < ApplicationController
 
     respond_to do |format|
       #format.html { redirect_to(user_baskets_url(@user)) }
-      format.html { redirect_to(user_checkouts_url(@basket.user)) }
-      format.json { head :ok }
+      format.html { redirect_to user_checkouts_url(@basket.user) }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/carrier_type_has_checkout_types_controller.rb

@@ -48,7 +48,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
     respond_to do |format|
       if @carrier_type_has_checkout_type.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.carrier_type_has_checkout_type'))
-        format.html { redirect_to(@carrier_type_has_checkout_type) }
+        format.html { redirect_to @carrier_type_has_checkout_type }
         format.json { render :json => @carrier_type_has_checkout_type, :status => :created, :location => @carrier_type_has_checkout_type }
       else
         prepare_options
@@ -64,8 +64,8 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
     respond_to do |format|
       if @carrier_type_has_checkout_type.update_attributes(params[:carrier_type_has_checkout_type])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.carrier_type_has_checkout_type'))
-        format.html { redirect_to(@carrier_type_has_checkout_type) }
-        format.json { head :ok }
+        format.html { redirect_to @carrier_type_has_checkout_type }
+        format.json { head :no_content }
       else
         prepare_options
         format.html { render :action => "edit" }
@@ -80,8 +80,8 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
     @carrier_type_has_checkout_type.destroy
 
     respond_to do |format|
-      format.html { redirect_to(carrier_type_has_checkout_types_url) }
-      format.json { head :ok }
+      format.html { redirect_to carrier_type_has_checkout_types_url }
+      format.json { head :no_content }
     end
   end
 

data/app/controllers/checked_items_controller.rb

@@ -109,8 +109,8 @@ class CheckedItemsController < ApplicationController
     respond_to do |format|
       if @checked_item.update_attributes(params[:checked_item])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.checked_item'))
-        format.html { redirect_to(@checked_item) }
-        format.json { head :ok }
+        format.html { redirect_to @checked_item }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @checked_item.errors, :status => :unprocessable_entity }
@@ -124,8 +124,8 @@ class CheckedItemsController < ApplicationController
     @checked_item.destroy
 
     respond_to do |format|
-      format.html { redirect_to(basket_checked_items_url(@checked_item.basket)) }
-      format.json { head :ok }
+      format.html { redirect_to basket_checked_items_url(@checked_item.basket) }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/checkins_controller.rb

@@ -1,7 +1,7 @@
 class CheckinsController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_user_if_nil
+  before_filter :get_user
   helper_method :get_basket
   cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
 
@@ -21,7 +21,7 @@ class CheckinsController < ApplicationController
 
     respond_to do |format|
       format.html # index.rhtml
-      format.json { render :json => @checkins.to_json }
+      format.json { render :json => @checkins }
       format.js
     end
   end
@@ -33,7 +33,7 @@ class CheckinsController < ApplicationController
 
     respond_to do |format|
       format.html # show.rhtml
-      format.json { render :json => @checkin.to_json }
+      format.json { render :json => @checkin }
     end
   end
 
@@ -43,7 +43,7 @@ class CheckinsController < ApplicationController
     redirect_to checkins_url
   end
 
-  # GET /checkins/1;edit
+  # GET /checkins/1/edit
   def edit
     #@checkin = Checkin.find(params[:id])
   end
@@ -116,9 +116,8 @@ class CheckinsController < ApplicationController
 
     respond_to do |format|
       if @checkin.update_attributes(params[:checkin])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.checkin'))
-        format.html { redirect_to checkin_url(@checkin) }
-        format.json { head :ok }
+        format.html { redirect_to @checkin, :notice => t('controller.successfully_updated', :model => t('activerecord.models.checkin')) }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @checkin.errors, :status => :unprocessable_entity }
@@ -134,7 +133,7 @@ class CheckinsController < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to checkins_url }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/checkout_stat_has_manifestations_controller.rb

@@ -44,7 +44,7 @@ class CheckoutStatHasManifestationsController < ApplicationController
     respond_to do |format|
       if @checkout_stat_has_manifestation.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.checkout_stat_has_manifestation'))
-        format.html { redirect_to(@checkout_stat_has_manifestation) }
+        format.html { redirect_to @checkout_stat_has_manifestation }
         format.json { render :json => @checkout_stat_has_manifestation, :status => :created, :location => @checkout_stat_has_manifestation }
       else
         format.html { render :action => "new" }
@@ -59,8 +59,8 @@ class CheckoutStatHasManifestationsController < ApplicationController
     respond_to do |format|
       if @checkout_stat_has_manifestation.update_attributes(params[:checkout_stat_has_manifestation])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.checkout_stat_has_manifestation'))
-        format.html { redirect_to(@checkout_stat_has_manifestation) }
-        format.json { head :ok }
+        format.html { redirect_to @checkout_stat_has_manifestation }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @checkout_stat_has_manifestation.errors, :status => :unprocessable_entity }
@@ -74,8 +74,8 @@ class CheckoutStatHasManifestationsController < ApplicationController
     @checkout_stat_has_manifestation.destroy
 
     respond_to do |format|
-      format.html { redirect_to(checkout_stat_has_manifestations_url) }
-      format.json { head :ok }
+      format.html { redirect_to checkout_stat_has_manifestations_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/checkout_stat_has_users_controller.rb

@@ -44,7 +44,7 @@ class CheckoutStatHasUsersController < ApplicationController
     respond_to do |format|
       if @checkout_stat_has_user.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.checkout_stat_has_user'))
-        format.html { redirect_to(@checkout_stat_has_user) }
+        format.html { redirect_to @checkout_stat_has_user }
         format.json { render :json => @checkout_stat_has_user, :status => :created, :location => @checkout_stat_has_user }
       else
         format.html { render :action => "new" }
@@ -59,8 +59,8 @@ class CheckoutStatHasUsersController < ApplicationController
     respond_to do |format|
       if @checkout_stat_has_user.update_attributes(params[:checkout_stat_has_user])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.checkout_stat_has_user'))
-        format.html { redirect_to(@checkout_stat_has_user) }
-        format.json { head :ok }
+        format.html { redirect_to @checkout_stat_has_user }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @checkout_stat_has_user.errors, :status => :unprocessable_entity }
@@ -74,8 +74,8 @@ class CheckoutStatHasUsersController < ApplicationController
     @checkout_stat_has_user.destroy
 
     respond_to do |format|
-      format.html { redirect_to(checkout_stat_has_users_url) }
-      format.json { head :ok }
+      format.html { redirect_to checkout_stat_has_users_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/checkout_types_controller.rb

@@ -64,7 +64,7 @@ class CheckoutTypesController < ApplicationController
     respond_to do |format|
       if @checkout_type.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.checkout_type'))
-        format.html { redirect_to(@checkout_type) }
+        format.html { redirect_to @checkout_type }
         format.json { render :json => @checkout_type, :status => :created, :location => @checkout_type }
       else
         format.html { render :action => "new" }
@@ -88,8 +88,8 @@ class CheckoutTypesController < ApplicationController
     respond_to do |format|
       if @checkout_type.update_attributes(params[:checkout_type])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.checkout_type'))
-        format.html { redirect_to(@checkout_type) }
-        format.json { head :ok }
+        format.html { redirect_to @checkout_type }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @checkout_type.errors, :status => :unprocessable_entity }
@@ -106,8 +106,8 @@ class CheckoutTypesController < ApplicationController
     @checkout_type.destroy
 
     respond_to do |format|
-      format.html { redirect_to(checkout_types_url) }
-      format.json { head :ok }
+      format.html { redirect_to checkout_types_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/checkouts_controller.rb

@@ -2,7 +2,7 @@ class CheckoutsController < ApplicationController
   before_filter :store_location, :only => :index
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_user_if_nil, :only => :index
+  before_filter :get_user, :only => :index
   helper_method :get_item
   after_filter :convert_charset, :only => :index
   cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
@@ -50,7 +50,7 @@ class CheckoutsController < ApplicationController
             access_denied
             return
           else
-            checkouts = current_user.checkouts.not_returned.order('checkouts.id DESC')
+            checkouts = current_user.checkouts.not_returned.order('checkouts.id DESC').page(params[:page])
           end
         end
       end
@@ -65,7 +65,7 @@ class CheckoutsController < ApplicationController
 
     respond_to do |format|
       format.html # index.rhtml
-      format.json { render :json => @checkouts.to_json }
+      format.json { render :json => @checkouts }
       format.rss  { render :layout => false }
       format.ics
       format.csv
@@ -78,11 +78,11 @@ class CheckoutsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.rhtml
-      format.json { render :json => @checkout.to_json }
+      format.json { render :json => @checkout }
     end
   end
 
-  # GET /checkouts/1;edit
+  # GET /checkouts/1/edit
   def edit
     @new_due_date = @checkout.get_new_due_date
   end
@@ -102,19 +102,18 @@ class CheckoutsController < ApplicationController
     end
     if @checkout.overdue?
       flash[:notice] = t('checkout.you_have_overdue_item')
-      #unless current_user.has_role?('Librarian')
+      unless current_user.has_role?('Librarian')
         redirect_to edit_checkout_url(@checkout)
         return
-      #end
+      end
     end
     @checkout.reload
     @checkout.checkout_renewal_count += 1
 
     respond_to do |format|
       if @checkout.update_attributes(params[:checkout])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.checkout'))
-        format.html { redirect_to(@checkout) }
-        format.json { head :ok }
+        format.html { redirect_to @checkout, :notice => t('controller.successfully_updated', :model => t('activerecord.models.checkout')) }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @checkout.errors, :status => :unprocessable_entity }
@@ -130,9 +129,8 @@ class CheckoutsController < ApplicationController
     @checkout.save!
 
     respond_to do |format|
-      flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.checkout'))
-      format.html { redirect_to user_checkouts_url(user) }
-      format.json { head :ok }
+      format.html { redirect_to user_checkouts_url(user), :notice => t('controller.successfully_deleted', :model => t('activerecord.models.checkout')) }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/item_has_use_restrictions_controller.rb

@@ -50,7 +50,7 @@ class ItemHasUseRestrictionsController < ApplicationController
     respond_to do |format|
       if @item_has_use_restriction.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.item_has_use_restriction'))
-        format.html { redirect_to(@item_has_use_restriction) }
+        format.html { redirect_to @item_has_use_restriction }
         format.json { render :json => @item_has_use_restriction, :status => :created, :location => @item_has_use_restriction }
       else
         @use_restrictions = UseRestriction.all
@@ -66,8 +66,8 @@ class ItemHasUseRestrictionsController < ApplicationController
     respond_to do |format|
       if @item_has_use_restriction.update_attributes(params[:item_has_use_restriction])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.item_has_use_restriction'))
-        format.html { redirect_to(@item_has_use_restriction) }
-        format.json { head :ok }
+        format.html { redirect_to @item_has_use_restriction }
+        format.json { head :no_content }
       else
         @use_restrictions = UseRestriction.all
         format.html { render :action => "edit" }
@@ -82,8 +82,8 @@ class ItemHasUseRestrictionsController < ApplicationController
     @item_has_use_restriction.destroy
 
     respond_to do |format|
-      format.html { redirect_to(item_has_use_restrictions_url) }
-      format.json { head :ok }
+      format.html { redirect_to item_has_use_restrictions_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/manifestation_checkout_stats_controller.rb

@@ -49,7 +49,7 @@ class ManifestationCheckoutStatsController < ApplicationController
     respond_to do |format|
       if @manifestation_checkout_stat.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.manifestation_checkout_stat'))
-        format.html { redirect_to(@manifestation_checkout_stat) }
+        format.html { redirect_to @manifestation_checkout_stat }
         format.json { render :json => @manifestation_checkout_stat, :status => :created, :location => @manifestation_checkout_stat }
       else
         format.html { render :action => "new" }
@@ -64,8 +64,8 @@ class ManifestationCheckoutStatsController < ApplicationController
     respond_to do |format|
       if @manifestation_checkout_stat.update_attributes(params[:manifestation_checkout_stat])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.manifestation_checkout_stat'))
-        format.html { redirect_to(@manifestation_checkout_stat) }
-        format.json { head :ok }
+        format.html { redirect_to @manifestation_checkout_stat }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @manifestation_checkout_stat.errors, :status => :unprocessable_entity }
@@ -79,8 +79,8 @@ class ManifestationCheckoutStatsController < ApplicationController
     @manifestation_checkout_stat.destroy
 
     respond_to do |format|
-      format.html { redirect_to(manifestation_checkout_stats_url) }
-      format.json { head :ok }
+      format.html { redirect_to manifestation_checkout_stats_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/manifestation_reserve_stats_controller.rb

@@ -49,7 +49,7 @@ class ManifestationReserveStatsController < ApplicationController
     respond_to do |format|
       if @manifestation_reserve_stat.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.manifestation_reserve_stat'))
-        format.html { redirect_to(@manifestation_reserve_stat) }
+        format.html { redirect_to @manifestation_reserve_stat }
         format.json { render :json => @manifestation_reserve_stat, :status => :created, :location => @manifestation_reserve_stat }
       else
         format.html { render :action => "new" }
@@ -64,8 +64,8 @@ class ManifestationReserveStatsController < ApplicationController
     respond_to do |format|
       if @manifestation_reserve_stat.update_attributes(params[:manifestation_reserve_stat])
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.manifestation_reserve_stat'))
-        format.html { redirect_to(@manifestation_reserve_stat) }
-        format.json { head :ok }
+        format.html { redirect_to @manifestation_reserve_stat }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @manifestation_reserve_stat.errors, :status => :unprocessable_entity }
@@ -79,8 +79,8 @@ class ManifestationReserveStatsController < ApplicationController
     @manifestation_reserve_stat.destroy
 
     respond_to do |format|
-      format.html { redirect_to(manifestation_reserve_stats_url) }
-      format.json { head :ok }
+      format.html { redirect_to manifestation_reserve_stats_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/reserve_stat_has_manifestations_controller.rb

@@ -43,8 +43,7 @@ class ReserveStatHasManifestationsController < ApplicationController
 
     respond_to do |format|
       if @reserve_stat_has_manifestation.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.reserve_stat_has_manifestation'))
-        format.html { redirect_to(@reserve_stat_has_manifestation) }
+        format.html { redirect_to @reserve_stat_has_manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.reserve_stat_has_manifestation')) }
         format.json { render :json => @reserve_stat_has_manifestation, :status => :created, :location => @reserve_stat_has_manifestation }
       else
         format.html { render :action => "new" }
@@ -58,9 +57,8 @@ class ReserveStatHasManifestationsController < ApplicationController
   def update
     respond_to do |format|
       if @reserve_stat_has_manifestation.update_attributes(params[:reserve_stat_has_manifestation])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.reserve_stat_has_manifestation'))
-        format.html { redirect_to(@reserve_stat_has_manifestation) }
-        format.json { head :ok }
+        format.html { redirect_to @reserve_stat_has_manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.reserve_stat_has_manifestation')) }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @reserve_stat_has_manifestation.errors, :status => :unprocessable_entity }
@@ -74,8 +72,8 @@ class ReserveStatHasManifestationsController < ApplicationController
     @reserve_stat_has_manifestation.destroy
 
     respond_to do |format|
-      format.html { redirect_to(reserve_stat_has_manifestations_url) }
-      format.json { head :ok }
+      format.html { redirect_to reserve_stat_has_manifestations_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/reserve_stat_has_users_controller.rb

@@ -44,7 +44,7 @@ class ReserveStatHasUsersController < ApplicationController
     respond_to do |format|
       if @reserve_stat_has_user.save
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.reserve_stat_has_user'))
-        format.html { redirect_to(@reserve_stat_has_user) }
+        format.html { redirect_to @reserve_stat_has_user }
         format.json { render :json => @reserve_stat_has_user, :status => :created, :location => @reserve_stat_has_user }
       else
         format.html { render :action => "new" }
@@ -59,8 +59,8 @@ class ReserveStatHasUsersController < ApplicationController
     respond_to do |format|
       if @reserve_stat_has_user.update_attributes(params[:reserve_stat_has_user])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.reserve_stat_has_user'))
-        format.html { redirect_to(@reserve_stat_has_user) }
-        format.json { head :ok }
+        format.html { redirect_to @reserve_stat_has_user }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @reserve_stat_has_user.errors, :status => :unprocessable_entity }
@@ -75,7 +75,7 @@ class ReserveStatHasUsersController < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to(reserve_stat_has_users_url) }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/reserves_controller.rb

@@ -3,7 +3,7 @@ class ReservesController < ApplicationController
   before_filter :store_location, :only => :index
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_user_if_nil, :only => [:index, :new]
+  before_filter :get_user, :only => [:index, :new]
   before_filter :store_page
   helper_method :get_manifestation
   helper_method :get_item
@@ -42,7 +42,7 @@ class ReservesController < ApplicationController
 
     respond_to do |format|
       format.html # index.rhtml
-      format.json { render :json => @reserves.to_json }
+      format.json { render :json => @reserves }
       format.rss  { render :layout => false }
       format.atom
       format.csv
@@ -54,7 +54,7 @@ class ReservesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.rhtml
-      format.json { render :json => @reserve.to_json }
+      format.json { render :json => @reserve }
     end
   end
 
@@ -94,7 +94,7 @@ class ReservesController < ApplicationController
     end
   end
 
-  # GET /reserves/1;edit
+  # GET /reserves/1/edit
   def edit
   end
 
@@ -126,9 +126,8 @@ class ReservesController < ApplicationController
       if @reserve.save
         @reserve.send_message('accepted')
 
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.reserve'))
         #format.html { redirect_to reserve_url(@reserve) }
-        format.html { redirect_to(@reserve) }
+        format.html { redirect_to @reserve, :notice => t('controller.successfully_created', :model => t('activerecord.models.reserve')) }
         format.json { render :json => @reserve, :status => :created, :location => reserve_url(@reserve) }
       else
         format.html { render :action => "new" }
@@ -168,8 +167,8 @@ class ReservesController < ApplicationController
         else
           flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.reserve'))
         end
-        format.html { redirect_to(@reserve) }
-        format.json { head :ok }
+        format.html { redirect_to @reserve }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @reserve.errors, :status => :unprocessable_entity }
@@ -193,9 +192,8 @@ class ReservesController < ApplicationController
     end
 
     respond_to do |format|
-      flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.reserve'))
-      format.html { redirect_to reserves_url }
-      format.json { head :ok }
+      format.html { redirect_to reserves_url, :notice => t('controller.successfully_deleted', :model => t('activerecord.models.reserve')) }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/user_checkout_stats_controller.rb

@@ -48,8 +48,7 @@ class UserCheckoutStatsController < ApplicationController
 
     respond_to do |format|
       if @user_checkout_stat.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.user_checkout_stat'))
-        format.html { redirect_to(@user_checkout_stat) }
+        format.html { redirect_to @user_checkout_stat, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_checkout_stat')) }
         format.json { render :json => @user_checkout_stat, :status => :created, :location => @user_checkout_stat }
       else
         format.html { render :action => "new" }
@@ -63,9 +62,8 @@ class UserCheckoutStatsController < ApplicationController
   def update
     respond_to do |format|
       if @user_checkout_stat.update_attributes(params[:user_checkout_stat])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.user_checkout_stat'))
-        format.html { redirect_to(@user_checkout_stat) }
-        format.json { head :ok }
+        format.html { redirect_to @user_checkout_stat, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_checkout_stat')) }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @user_checkout_stat.errors, :status => :unprocessable_entity }
@@ -79,8 +77,8 @@ class UserCheckoutStatsController < ApplicationController
     @user_checkout_stat.destroy
 
     respond_to do |format|
-      format.html { redirect_to(user_checkout_stats_url) }
-      format.json { head :ok }
+      format.html { redirect_to user_checkout_stats_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/user_group_has_checkout_types_controller.rb

@@ -65,8 +65,8 @@ class UserGroupHasCheckoutTypesController < ApplicationController
     respond_to do |format|
       if @user_group_has_checkout_type.update_attributes(params[:user_group_has_checkout_type])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.user_group_has_checkout_type'))
-        format.html { redirect_to(@user_group_has_checkout_type) }
-        format.json { head :ok }
+        format.html { redirect_to @user_group_has_checkout_type }
+        format.json { head :no_content }
       else
         prepare_options
         format.html { render :action => "edit" }
@@ -81,8 +81,8 @@ class UserGroupHasCheckoutTypesController < ApplicationController
     @user_group_has_checkout_type.destroy
 
     respond_to do |format|
-      format.html { redirect_to(user_group_has_checkout_types_url) }
-      format.json { head :ok }
+      format.html { redirect_to user_group_has_checkout_types_url }
+      format.json { head :no_content }
     end
   end
 

data/app/controllers/user_reserve_stats_controller.rb

@@ -48,8 +48,7 @@ class UserReserveStatsController < ApplicationController
 
     respond_to do |format|
       if @user_reserve_stat.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.user_reserve_stat'))
-        format.html { redirect_to(@user_reserve_stat) }
+        format.html { redirect_to @user_reserve_stat, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_reserve_stat')) }
         format.json { render :json => @user_reserve_stat, :status => :created, :location => @user_reserve_stat }
       else
         format.html { render :action => "new" }
@@ -63,9 +62,8 @@ class UserReserveStatsController < ApplicationController
   def update
     respond_to do |format|
       if @user_reserve_stat.update_attributes(params[:user_reserve_stat])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.user_reserve_stat'))
-        format.html { redirect_to(@user_reserve_stat) }
-        format.json { head :ok }
+        format.html { redirect_to @user_reserve_stat, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_reserve_stat')) }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @user_reserve_stat.errors, :status => :unprocessable_entity }
@@ -79,8 +77,8 @@ class UserReserveStatsController < ApplicationController
     @user_reserve_stat.destroy
 
     respond_to do |format|
-      format.html { redirect_to(user_reserve_stats_url) }
-      format.json { head :ok }
+      format.html { redirect_to user_reserve_stats_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/models/checkout.rb

@@ -52,7 +52,7 @@ class Checkout < ActiveRecord::Base
   end
 
   def overdue?
-    if Time.zone.now > self.due_date.end_of_day
+    if Time.zone.now.tomorrow.beginning_of_day > self.due_date
       return true
     else
       return false

data/app/models/user_group_has_checkout_type.rb

@@ -15,10 +15,13 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
 
   def create_lending_policy
     self.checkout_type.items.find_each do |item|
-      sql = ['INSERT INTO lending_policies (item_id, user_group_id, loan_period, renewal, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)', item.id, self.user_group_id, self.checkout_period, self.checkout_renewal_limit, Time.zone.now, Time.zone.now]
-      ActiveRecord::Base.connection.execute(
-        self.class.send(:sanitize_sql_array, sql)
-      )
+      policy = LendingPolicy.where(:item_id => item.id, :user_group_id => user_group_id).select(:id).first
+      unless policy
+        sql = ['INSERT INTO lending_policies (item_id, user_group_id, loan_period, renewal, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)', item.id, user_group_id, checkout_period, checkout_renewal_limit, Time.zone.now, Time.zone.now]
+        ActiveRecord::Base.connection.execute(
+          self.class.send(:sanitize_sql_array, sql)
+        )
+      end
     end
   end
 

data/app/views/checkins/_list.html.erb

@@ -40,7 +40,7 @@
       <%- end -%>
     </td>
     <td>
-      <% if checkin.checkout.user %>
+      <% if checkin.checkout.try(:user) %>
         <%= link_to checkin.checkout.user.username, checkin.checkout.user -%>
       <% end %>
     </td>

data/db/migrate/20090831220301_create_lending_policies.rb

@@ -12,8 +12,7 @@ class CreateLendingPolicies < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :lending_policies, :item_id
-    add_index :lending_policies, :user_group_id
+    add_index :lending_policies, [:item_id, :user_group_id], :unique => true
   end
 
   def self.down

data/lib/enju_circulation/engine.rb

@@ -9,6 +9,7 @@ require "will_paginate"
 require "sunspot_rails"
 require "enju_message"
 require "enju_event"
+require "acts_as_list"
 
 module EnjuCirculation
   class Engine < Rails::Engine

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -40,9 +40,8 @@ class ApplicationController < ActionController::Base
     raise CanCan::AccessDenied
   end
 
-  def get_user_if_nil
+  def get_user
     @user = User.where(:username => params[:user_id]).first if params[:user_id]
-    #authorize! :show, @user if @user
   end
 
   def get_basket
@@ -62,6 +61,11 @@ class ApplicationController < ActionController::Base
     @user_group = UserGroup.find(params[:user_group_id]) if params[:user_group_id]
   end
 
+  def get_item
+    @item = Item.find(params[:item_id]) if params[:item_id]
+    authorize! :show, @item if @item
+  end
+
   def set_locale
     if params[:locale]
       unless I18n.available_locales.include?(params[:locale].to_s.intern)

data/spec/dummy/app/models/item.rb

@@ -26,6 +26,7 @@ class Item < ActiveRecord::Base
     integer :circulation_status_id
   end
   attr_accessor :use_restriction_id
+  attr_accessor :library_id, :manifestation_id
 
   def set_circulation_status
     self.circulation_status = CirculationStatus.where(:name => 'In Process').first if self.circulation_status.nil?

data/spec/dummy/db/schema.rb

@@ -254,8 +254,7 @@ ActiveRecord::Schema.define(:version => 20120224094141) do
     t.datetime "updated_at",                      :null => false
   end
 
-  add_index "lending_policies", ["item_id"], :name => "index_lending_policies_on_item_id"
-  add_index "lending_policies", ["user_group_id"], :name => "index_lending_policies_on_user_group_id"
+  add_index "lending_policies", ["item_id", "user_group_id"], :name => "index_lending_policies_on_item_id_and_user_group_id", :unique => true
 
   create_table "libraries", :force => true do |t|
     t.integer  "patron_id"

data/spec/factories/item.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :item do |f|
+    f.sequence(:item_identifier){|n| "item_#{n}"}
+    f.circulation_status_id{CirculationStatus.find(1).id} if defined?(EnjuCircuation)
+    f.manifestation_id{FactoryGirl.create(:manifestation).id}
+  end
+end

data/spec/factories/item_has_use_restriction.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :item_has_use_restriction do |f|
+    f.item_id{FactoryGirl.create(:item).id}
+    f.use_restriction_id{FactoryGirl.create(:use_restriction).id}
+  end
+end

data/spec/factories/lending_policy.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :lending_policy do |f|
+    f.user_group_id{FactoryGirl.create(:user_group).id}
+    f.item_id{FactoryGirl.create(:item).id}
+  end
+end

data/spec/factories/use_restriction.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :use_restriction do |f|
+    f.sequence(:name){|n| "use_restriction_#{n}"}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70123702805760 !ruby/object:Gem::Requirement
+  requirement: &70124183652540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702805760
+  version_requirements: *70124183652540
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70123702805340 !ruby/object:Gem::Requirement
+  requirement: &70124183652120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702805340
+  version_requirements: *70124183652120
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70123702804880 !ruby/object:Gem::Requirement
+  requirement: &70124183651620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702804880
+  version_requirements: *70124183651620
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70123702820840 !ruby/object:Gem::Requirement
+  requirement: &70124183651200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702820840
+  version_requirements: *70124183651200
 - !ruby/object:Gem::Dependency
   name: validates_timeliness
-  requirement: &70123702820420 !ruby/object:Gem::Requirement
+  requirement: &70124183650780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702820420
+  version_requirements: *70124183650780
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70123702819920 !ruby/object:Gem::Requirement
+  requirement: &70124183699380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702819920
+  version_requirements: *70124183699380
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70123702819500 !ruby/object:Gem::Requirement
+  requirement: &70124183698840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702819500
+  version_requirements: *70124183698840
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70123702819040 !ruby/object:Gem::Requirement
+  requirement: &70124183698260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702819040
+  version_requirements: *70124183698260
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70123702818540 !ruby/object:Gem::Requirement
+  requirement: &70124183697680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702818540
+  version_requirements: *70124183697680
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70123702818120 !ruby/object:Gem::Requirement
+  requirement: &70124183697080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702818120
+  version_requirements: *70124183697080
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70123702817660 !ruby/object:Gem::Requirement
+  requirement: &70124183696280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702817660
+  version_requirements: *70124183696280
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70123702817160 !ruby/object:Gem::Requirement
+  requirement: &70124183695580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123702817160
+  version_requirements: *70124183695580
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70123702816660 !ruby/object:Gem::Requirement
+  requirement: &70124183694220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70123702816660
+  version_requirements: *70124183694220
 - !ruby/object:Gem::Dependency
   name: enju_message
-  requirement: &70123702816200 !ruby/object:Gem::Requirement
+  requirement: &70124183693380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70123702816200
+  version_requirements: *70124183693380
 - !ruby/object:Gem::Dependency
   name: enju_event
-  requirement: &70123702815740 !ruby/object:Gem::Requirement
+  requirement: &70124183692440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70123702815740
+  version_requirements: *70124183692440
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70123702815360 !ruby/object:Gem::Requirement
+  requirement: &70124183691500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123702815360
+  version_requirements: *70124183691500
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70123702814900 !ruby/object:Gem::Requirement
+  requirement: &70124183688980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123702814900
+  version_requirements: *70124183688980
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70123702814400 !ruby/object:Gem::Requirement
+  requirement: &70124183687500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *70123702814400
+  version_requirements: *70124183687500
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70123702813980 !ruby/object:Gem::Requirement
+  requirement: &70124183686700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123702813980
+  version_requirements: *70124183686700
 description: Circulation management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -500,7 +500,6 @@ files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -555,12 +554,16 @@ files:
 - spec/factories/checkout_stat_has_manifestation.rb
 - spec/factories/checkout_stat_has_user.rb
 - spec/factories/checkout_type.rb
+- spec/factories/item.rb
+- spec/factories/item_has_use_restriction.rb
+- spec/factories/lending_policy.rb
 - spec/factories/manifestation.rb
 - spec/factories/manifestation_checkout_stat.rb
 - spec/factories/manifestation_reserve_stat.rb
 - spec/factories/reserve.rb
 - spec/factories/reserve_stat_has_manifestation.rb
 - spec/factories/reserve_stat_has_user.rb
+- spec/factories/use_restriction.rb
 - spec/factories/user.rb
 - spec/factories/user_checkout_stat.rb
 - spec/factories/user_group.rb
@@ -722,7 +725,6 @@ test_files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -777,12 +779,16 @@ test_files:
 - spec/factories/checkout_stat_has_manifestation.rb
 - spec/factories/checkout_stat_has_user.rb
 - spec/factories/checkout_type.rb
+- spec/factories/item.rb
+- spec/factories/item_has_use_restriction.rb
+- spec/factories/lending_policy.rb
 - spec/factories/manifestation.rb
 - spec/factories/manifestation_checkout_stat.rb
 - spec/factories/manifestation_reserve_stat.rb
 - spec/factories/reserve.rb
 - spec/factories/reserve_stat_has_manifestation.rb
 - spec/factories/reserve_stat_has_user.rb
+- spec/factories/use_restriction.rb
 - spec/factories/user.rb
 - spec/factories/user_checkout_stat.rb
 - spec/factories/user_group.rb
@@ -850,3 +856,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
+has_rdoc: