enju_circulation 0.1.0.pre37 → 0.1.0.pre38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01334aaf40897445116e546ee2c9d828d0606ad1
-  data.tar.gz: 2463b399fc752361c6b24eb7d104748b8c7acbf4
+  metadata.gz: 8a351d924a626f215711e04a84233a743723855c
+  data.tar.gz: ffd37f15ff29d2c38f2c80b238cf7e67f3866d08
 SHA512:
-  metadata.gz: 3fce694d0b9db2e9a7074b281406504b316976e824556b6c81b790f3450c93cd8c681f8be8c3be6ca32cc69a33c3984153b321d47d895813426954f2f1909151
-  data.tar.gz: 59f4457eb47388dfa0e6f1f43e2b979e7ccc808298593c6352b40d1a979a2a8e058cddb8e692d6ec4f5d01c89b8a6da1e4057c6eb29e1888064b401965241a4a
+  metadata.gz: 903430be5e4584e3cfb17e2854458d6ebf68334f7b91f42c5d12f3d2c18a5e7eade3eeb67aa877d51786785e5dad5087acf484b1233fe20ab44c911745e0613f
+  data.tar.gz: 89158339d97c670bf648d111f12aac3d3696d5922f541486f8ad20b9936686c08a5a2e49d4419ede7a414c08469468731715249f92902c085a51644c3cf8f571

data/app/controllers/checked_items_controller.rb

@@ -64,9 +64,9 @@ class CheckedItemsController < ApplicationController
         if @checked_item.item.include_supplements
           flash[:message] << t('item.this_item_include_supplement')
         end
-        format.html { redirect_to(basket_checked_items_url(@basket), notice: t('controller.successfully_created', model: t('activerecord.models.checked_item'))) }
+        format.html { redirect_to(checked_items_url(basket_id: @basket.id), notice: t('controller.successfully_created', model: t('activerecord.models.checked_item'))) }
         format.json { render json: @checked_item, status: :created, location: @checked_item }
-        format.js { redirect_to(basket_checked_items_url(@basket, format: :js)) }
+        format.js { redirect_to(checked_items_url(basket_id: @basket.id, format: :js)) }
       else
         @checked_items = @basket.checked_items.order('created_at DESC').page(1)
         format.html { render action: "index" }
@@ -103,7 +103,7 @@ class CheckedItemsController < ApplicationController
     @checked_item.destroy
 
     respond_to do |format|
-      format.html { redirect_to basket_checked_items_url(@checked_item.basket) }
+      format.html { redirect_to checked_items_url(basket_id: @checked_item.basket_id) }
       format.json { head :no_content }
     end
   end

data/app/controllers/checkins_controller.rb

@@ -75,9 +75,9 @@ class CheckinsController < ApplicationController
           flash[:message] << t('checkin.not_checked_out')
         end
         flash[:message] << message if message
-        format.html { redirect_to basket_checkins_url(@checkin.basket) }
+        format.html { redirect_to checkins_url(basket_id: @checkin.basket_id) }
         format.json { render json: @checkin, status: :created, location: @checkin }
-        format.js { redirect_to basket_checkins_url(@basket, format: :js) }
+        format.js { redirect_to checkins_url(basket_id: @basket.id, format: :js) }
       else
         @checkins = @basket.checkins.page(1)
         format.html { render action: "new" }

data/app/controllers/checkout_types_controller.rb

@@ -6,9 +6,9 @@ class CheckoutTypesController < ApplicationController
   # GET /checkout_types.json
   def index
     if @user_group
-      @checkout_types = @user_group.checkout_types.order('checkout_types.position').page(params[:page])
+      @checkout_types = @user_group.checkout_types.order('checkout_types.position')
     else
-      @checkout_types = CheckoutType.order(:position).page(params[:page])
+      @checkout_types = CheckoutType.order(:position)
     end
 
     respond_to do |format|

data/app/controllers/circulation_statuses_controller.rb

@@ -1,13 +1,84 @@
-class CirculationStatusesController < InheritedResources::Base
-  respond_to :html, :json
+class CirculationStatusesController < ApplicationController
   load_and_authorize_resource
 
+  # GET /circulation_statuses
+  # GET /circulation_statuses.json
+  def index
+    @circulation_statuses = CirculationStatus.order(:position)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @circulation_statuses }
+    end
+  end
+
+  # GET /circulation_statuses/1
+  # GET /circulation_statuses/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @circulation_status }
+    end
+  end
+
+  # GET /circulation_statuses/new
+  # GET /circulation_statuses/new.json
+  def new
+    @circulation_status = CirculationStatus.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @circulation_status }
+    end
+  end
+
+  # GET /circulation_statuses/1/edit
+  def edit
+  end
+
+  # POST /circulation_statuses
+  # POST /circulation_statuses.json
+  def create
+    @circulation_status = CirculationStatus.new(params[:circulation_status])
+
+    respond_to do |format|
+      if @circulation_status.save
+        format.html { redirect_to @circulation_status, notice: t('controller.successfully_created', model: t('activerecord.models.circulation_status')) }
+        format.json { render json: @circulation_status, status: :created, location: @circulation_status }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @circulation_status.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /circulation_statuses/1
+  # PUT /circulation_statuses/1.json
   def update
-    @circulation_status = CirculationStatus.find(params[:id])
     if params[:move]
       move_position(@circulation_status, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @circulation_status.update_attributes(params[:circulation_status])
+        format.html { redirect_to @circulation_status, notice: t('controller.successfully_updated', model: t('activerecord.models.circulation_status')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @circulation_status.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /circulation_statuses/1
+  # DELETE /circulation_statuses/1.json
+  def destroy
+    @circulation_status.destroy
+
+    respond_to do |format|
+      format.html { redirect_to circulation_statuses_url }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/lending_policies_controller.rb

@@ -1,10 +1,80 @@
-class LendingPoliciesController < InheritedResources::Base
+class LendingPoliciesController < ApplicationController
   load_and_authorize_resource
   before_filter :get_user_group, :get_item
-  before_filter :prepare_options, only: [:edit, :update]
+  before_filter :prepare_options, only: [:new, :edit]
 
+  # GET /lending_policies
+  # GET /lending_policies.json
   def index
     @lending_policies = LendingPolicy.page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @lending_policies }
+    end
+  end
+
+  # GET /lending_policies/1
+  # GET /lending_policies/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @lending_policy }
+    end
+  end
+
+  # GET /lending_policies/new
+  # GET /lending_policies/new.json
+  def new
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @lending_policy }
+    end
+  end
+
+  # GET /lending_policies/1/edit
+  def edit
+  end
+
+  # POST /lending_policies
+  # POST /lending_policies.json
+  def create
+    respond_to do |format|
+      if @lending_policy.save
+        format.html { redirect_to @lending_policy, notice: t('controller.successfully_created', model: t('activerecord.models.lending_policy')) }
+        format.json { render json: @lending_policy, status: :created, location: @lending_policy }
+      else
+        prepare_options
+        format.html { render action: "new" }
+        format.json { render json: @lending_policy.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /lending_policies/1
+  # PUT /lending_policies/1.json
+  def update
+    respond_to do |format|
+      if @lending_policy.update_attributes(params[:lending_policy])
+        format.html { redirect_to @lending_policy, notice: t('controller.successfully_updated', model: t('activerecord.models.lending_policy')) }
+        format.json { head :no_content }
+      else
+        prepare_options
+        format.html { render action: "edit" }
+        format.json { render json: @lending_policy.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /lending_policies/1
+  # DELETE /lending_policies/1.json
+  def destroy
+    @lending_policy.destroy
+
+    respond_to do |format|
+      format.html { redirect_to lending_policies_url }
+      format.json { head :no_content }
+    end
   end
 
   private

data/app/controllers/use_restrictions_controller.rb

@@ -1,13 +1,84 @@
-class UseRestrictionsController < InheritedResources::Base
-  respond_to :html, :json
+class UseRestrictionsController < ApplicationController
   load_and_authorize_resource
 
+  # GET /use_restrictions
+  # GET /use_restrictions.json
+  def index
+    @use_restrictions = UseRestriction.order(:position)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @use_restrictions }
+    end
+  end
+
+  # GET /use_restrictions/1
+  # GET /use_restrictions/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @use_restriction }
+    end
+  end
+
+  # GET /use_restrictions/new
+  # GET /use_restrictions/new.json
+  def new
+    @use_restriction = UseRestriction.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @use_restriction }
+    end
+  end
+
+  # GET /use_restrictions/1/edit
+  def edit
+  end
+
+  # POST /use_restrictions
+  # POST /use_restrictions.json
+  def create
+    @use_restriction = UseRestriction.new(params[:use_restriction])
+
+    respond_to do |format|
+      if @use_restriction.save
+        format.html { redirect_to @use_restriction, notice: t('controller.successfully_created', model: t('activerecord.models.use_restriction')) }
+        format.json { render json: @use_restriction, status: :created, location: @use_restriction }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @use_restriction.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /use_restrictions/1
+  # PUT /use_restrictions/1.json
   def update
-    @use_restriction = UseRestriction.find(params[:id])
     if params[:move]
       move_position(@use_restriction, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @use_restriction.update_attributes(params[:use_restriction])
+        format.html { redirect_to @use_restriction, notice: t('controller.successfully_updated', model: t('activerecord.models.use_restriction')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @use_restriction.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /use_restrictions/1
+  # DELETE /use_restrictions/1.json
+  def destroy
+    @use_restriction.destroy
+
+    respond_to do |format|
+      format.html { redirect_to use_restrictions_url }
+      format.json { head :no_content }
+    end
   end
 end

data/app/models/checkin.rb

@@ -3,7 +3,7 @@ class Checkin < ActiveRecord::Base
   default_scope order: 'checkins.id DESC'
   scope :on, lambda {|date| {conditions: ['created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day]}}
   has_one :checkout
-  belongs_to :item
+  belongs_to :item, touch: true
   belongs_to :librarian, class_name: 'User'
   belongs_to :basket
 

data/app/models/checkout.rb

@@ -10,7 +10,7 @@ class Checkout < ActiveRecord::Base
 
   belongs_to :user
   delegate :username, :user_number, :to => :user, :prefix => true
-  belongs_to :item
+  belongs_to :item, touch: true
   belongs_to :checkin
   belongs_to :librarian, class_name: 'User'
   belongs_to :basket

data/app/models/circulation_status.rb

@@ -1,11 +1,7 @@
 class CirculationStatus < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
-  #include MasterModel
-  acts_as_list
+  include MasterModel
   validates :name, presence: true, format: {with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/}
-  validates :display_name, presence: true
-  before_validation :set_display_name, on: :create
-  normalize_attributes :name
 
   default_scope order: "circulation_statuses.position"
   scope :available_for_checkout, where(name: 'Available On Shelf')

data/app/models/reserve.rb

@@ -172,9 +172,9 @@ class Reserve < ActiveRecord::Base
     Reserve.transaction do
       case current_state
       when 'requested'
-        message_template_to_agent = MessageTemplate.localized_template('reservation_accepted_for_patron', user.profile.locale)
+        message_template_to_patron = MessageTemplate.localized_template('reservation_accepted_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_agent}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron}, as: :admin)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # 受付時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_accepted_for_library', user.profile.locale)
@@ -183,9 +183,9 @@ class Reserve < ActiveRecord::Base
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # 受付時は即時送信
       when 'canceled'
-        message_template_to_agent = MessageTemplate.localized_template('reservation_canceled_for_patron', user.profile.locale)
+        message_template_to_patron = MessageTemplate.localized_template('reservation_canceled_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_agent}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron}, as: :admin)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # キャンセル時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', user.profile.locale)
@@ -194,9 +194,9 @@ class Reserve < ActiveRecord::Base
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # キャンセル時は即時送信
       when 'expired'
-        message_template_to_agent = MessageTemplate.localized_template('reservation_expired_for_patron', user.profile.locale)
+        message_template_to_patron = MessageTemplate.localized_template('reservation_expired_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_agent}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron}, as: :admin)
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent)
         reload

data/app/models/use_restriction.rb

@@ -1,11 +1,7 @@
 class UseRestriction < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
-  #include MasterModel
-  acts_as_list
+  include MasterModel
   validates :name, presence: true, format: {with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/}
-  validates :display_name, presence: true
-  before_validation :set_display_name, on: :create
-  normalize_attributes :name
 
   default_scope {order('use_restrictions.position')}
   scope :available, -> {where(name: ['Not For Loan', 'Limited Circulation, Normal Loan Period'])}

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

@@ -1,7 +1,7 @@
 <div style="color: red"><%= flash[:message] -%></div>
 
 <div class="search_form">
-<%= form_for :checked_item, html: {method: :post}, url: basket_checked_items_path(@basket), remote: true do |f| -%>
+<%= form_for :checked_item, html: {method: :post}, url: checked_items_path(basket_id: @basket.id), remote: true do |f| -%>
   <%= f.error_messages -%>
   <p>
     <%= f.label :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: <%= f.search_field :item_identifier -%>
@@ -22,7 +22,7 @@ $(document).ready(function(){
 
 <%= render 'checked_item' %>
 
-<%= form_for(:basket, url: {controller: 'baskets', action: 'update', id: @basket.id}, html: { method: :put }) do |f| -%>
+<%= form_for(:basket, url: basket_path(@basket), html: { method: :put }) do |f| -%>
   <div>
     <%= f.submit t('checked_item.checkout'), 'data-disable-with' => t('page.saving') -%>
   </div>

data/app/views/checked_items/edit.html.erb

@@ -19,4 +19,4 @@
 <%- end -%>
 
 <%= link_to t('page.show'), checked_item_path(@checked_item) -%> |
-<%= link_to t('page.back'), basket_checked_items_path(@checked_item.basket) -%>
+<%= link_to t('page.back'), checked_items_path(basket_id: @checked_item.basket_id) -%>

data/app/views/checked_items/show.html.erb

@@ -19,6 +19,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_checked_item_path(@checked_item) -%></li>
-    <li><%= link_to t('page.back'), basket_checked_items_path(@checked_item.basket) -%></li>
+    <li><%= link_to t('page.back'), checked_items_path(basket_id: @checked_item.basket_id) -%></li>
   </ul>
 </div>

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

@@ -1,7 +1,7 @@
 <div style="color: red"><%= flash[:message] -%></div>
 
 <div class="search_form">
-<%= form_for :checkin, html: {method: :post}, url: basket_checkins_path(@basket), remote: true do |f| -%>
+<%= form_for :checkin, html: {method: :post}, url: checkins_path(basket_id: @basket.id), remote: true do |f| -%>
   <%= f.error_messages %>
   <p>
     <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: