enju_circulation 0.0.62 → 0.0.63

data/app/controllers/checkins_controller.rb

@@ -100,9 +100,11 @@ class CheckinsController < ApplicationController
       item = Item.where(:item_identifier => @checkin.item_identifier.to_s.strip).first
     end
     @checkin.item = item
+    @checkin.assign_attributes(params[:checkin])
+    @checkin.librarian = current_user
 
     respond_to do |format|
-      if @checkin.update_attributes(params[:checkin])
+      if @checkin.save
         format.html { redirect_to @checkin, :notice => t('controller.successfully_updated', :model => t('activerecord.models.checkin')) }
         format.json { head :no_content }
       else

data/app/controllers/reserves_controller.rb

@@ -62,16 +62,16 @@ class ReservesController < ApplicationController
   # GET /reserves/new.json
   def new
     @reserve = Reserve.new(params[:reserve])
-    if @user
+
+    if current_user.has_role?('Librarian')
       @reserve.user = @user
     else
-      @reserve.user = User.where(:user_number => @reserve.user_number).first if @reserve.user_number.to_s.strip.present?
-    end
-
-    unless current_user.has_role?('Librarian')
-      if @reserve.user and @reserve.user != current_user
-        access_denied; return
+      if @user.present?
+        if @user != current_user
+          access_denied; return
+        end
       end
+      @reserve.user_number = current_user.user_number
     end
 
     get_manifestation
@@ -98,9 +98,15 @@ class ReservesController < ApplicationController
     @reserve = Reserve.new(params[:reserve])
     @reserve.user = User.where(:user_number => @reserve.user_number).first if @reserve.user_number.to_s.strip.present?
 
-    unless current_user.has_role?('Librarian')
+    if current_user.has_role?('Librarian')
+      unless @reserve.user
+        @reserve.user = @user
+      end
+    else
       if @reserve.user != current_user
-        access_denied; return
+        if @user != current_user
+          access_denied; return
+        end
       end
     end
 
@@ -121,6 +127,7 @@ class ReservesController < ApplicationController
   # PUT /reserves/1
   # PUT /reserves/1.json
   def update
+    @reserve.assign_attributes(params[:reserve])
     @reserve.user = User.where(:user_number => @reserve.user_number).first if @reserve.user_number.to_s.strip.present?
 
     unless current_user.has_role?('Librarian')
@@ -134,7 +141,7 @@ class ReservesController < ApplicationController
     end
 
     respond_to do |format|
-      if @reserve.update_attributes(params[:reserve])
+      if @reserve.save
         if @reserve.state == 'canceled'
           flash[:notice] = t('reserve.reservation_was_canceled')
           @reserve.send_message

data/app/models/checked_item.rb

@@ -1,5 +1,5 @@
 class CheckedItem < ActiveRecord::Base
-  attr_accessible
+  attr_accessible :item_identifier, :ignore_restriction
   belongs_to :item #, :validate => true
   belongs_to :basket #, :validate => true
   belongs_to :librarian, :class_name => 'User' #, :validate => true

data/app/models/checkin.rb

@@ -20,7 +20,9 @@ class Checkin < ActiveRecord::Base
   def item_checkin(current_user)
     message = ''
     Checkin.transaction do
-      checkouts = Checkout.not_returned.where(:item_id => item_id).select([:id, :item_id, :user_id, :basket_id, :lock_version])
+      checkouts = Checkout.not_returned.where(:item_id => item_id).select(
+        [:id, :item_id, :user_id, :basket_id, :due_date, :lock_version]
+      )
       item.checkin!
       checkouts.each do |checkout|
         # TODO: ILL時の処理
@@ -28,7 +30,7 @@ class Checkin < ActiveRecord::Base
         unless checkout.user.try(:save_checkout_history)
           checkout.user = nil
         end
-        checkout.save(:validate => false)
+        checkout.save!
         unless checkout.item.shelf.library == current_user.library
           message << I18n.t('checkin.other_library_item')
         end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.62"
+  VERSION = "0.0.63"
 end

data/spec/controllers/checkins_controller_spec.rb

@@ -312,8 +312,8 @@ describe CheckinsController do
   describe "PUT update" do
     before(:each) do
       @checkin = checkins(:checkin_00001)
-      @attrs = {:item_identifier => @checkin.item.item_identifier, :librarian_id => FactoryGirl.create(:librarian).id}
-      @invalid_attrs = {:basket_id => ''}
+      @attrs = {:item_identifier => @checkin.item.item_identifier}
+      @invalid_attrs = {:item_identifier => 'invalid'}
     end
 
     describe "When logged in as Administrator" do

data/spec/controllers/checkouts_controller_spec.rb

@@ -237,7 +237,7 @@ describe CheckoutsController do
     before(:each) do
       @checkout = checkouts(:checkout_00003)
       @attrs = {:due_date => 1.day.from_now}
-      @invalid_attrs = {:item_id => ''}
+      @invalid_attrs = {:item_identifier => 'invalid'}
     end
 
     describe "When logged in as Administrator" do

metadata

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