enju_circulation 0.1.0.pre36 → 0.1.0.pre37

data/app/models/use_restriction.rb

@@ -2,15 +2,15 @@ class UseRestriction < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   #include MasterModel
   acts_as_list
-  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
+  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'])}
+  scope :available, -> {where(name: ['Not For Loan', 'Limited Circulation, Normal Loan Period'])}
   has_many :item_has_use_restrictions
-  has_many :items, :through => :item_has_use_restrictions
+  has_many :items, through: :item_has_use_restrictions
 
   def set_display_name
     self.display_name = "#{I18n.locale}: #{name}" if display_name.blank?

data/app/models/user_checkout_stat.rb

@@ -5,7 +5,8 @@ class UserCheckoutStat < ActiveRecord::Base
   default_scope {order('user_checkout_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}
   has_many :checkout_stat_has_users
-  has_many :users, :through => :checkout_stat_has_users
+  has_many :users, through: :checkout_stat_has_users
+  belongs_to :user
 
   paginates_per 10
   attr_accessor :mode
@@ -33,6 +34,7 @@ class UserCheckoutStat < ActiveRecord::Base
     end
     self.completed_at = Time.zone.now
     transition_to!(:completed)
+    send_message
   end
 
   private
@@ -49,10 +51,9 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #
-

data/app/models/user_checkout_stat_transition.rb

@@ -5,3 +5,16 @@ class UserCheckoutStatTransition < ActiveRecord::Base
   belongs_to :user_checkout_stat, inverse_of: :user_checkout_stat_transitions
   attr_accessible :to_state, :sort_key, :metadata
 end
+
+# == Schema Information
+#
+# Table name: user_checkout_stat_transitions
+#
+#  id                    :integer          not null, primary key
+#  to_state              :string(255)
+#  metadata              :text             default("{}")
+#  sort_key              :integer
+#  user_checkout_stat_id :integer
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#

data/app/models/user_group_has_checkout_type.rb

@@ -5,22 +5,22 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
     :set_due_date_before_closing_day, :fixed_due_date, :note, :position,
     :user_group, :checkout_type
   scope :available_for_item, lambda{|item| where(:checkout_type_id => item.checkout_type.id)}
-  scope :available_for_carrier_type, lambda{|carrier_type| {:include => {:checkout_type => :carrier_types}, :conditions => ['carrier_types.id = ?', carrier_type.id]}}
+  scope :available_for_carrier_type, lambda{|carrier_type| {:include => {:checkout_type => :carrier_types}, conditions: ['carrier_types.id = ?', carrier_type.id]}}
 
-  belongs_to :user_group, :validate => true
-  belongs_to :checkout_type, :validate => true
+  belongs_to :user_group, validate: true
+  belongs_to :checkout_type, validate: true
 
   validates_presence_of :user_group, :checkout_type
   validates_associated :user_group, :checkout_type
-  validates_uniqueness_of :checkout_type_id, :scope => :user_group_id
+  validates_uniqueness_of :checkout_type_id, scope: :user_group_id
   after_create :create_lending_policy
   after_update :update_lending_policy
 
-  acts_as_list :scope => :user_group_id
+  acts_as_list scope: :user_group_id
 
   def create_lending_policy
     self.checkout_type.items.find_each do |item|
-      policy = LendingPolicy.where(:item_id => item.id, :user_group_id => user_group_id).select(:id).first
+      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(
@@ -42,9 +42,9 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
   def self.update_current_checkout_count
     sql = [
       'SELECT count(checkouts.id) as current_checkout_count,
-        users.user_group_id,
+        profiles.user_group_id,
         items.checkout_type_id
-        FROM checkouts LEFT OUTER JOIN items
+        FROM checkouts, profiles LEFT OUTER JOIN items
         ON (checkouts.item_id = items.id)
         LEFT OUTER JOIN users
         ON (users.id = checkouts.user_id)

data/app/models/user_reserve_stat.rb

@@ -5,7 +5,8 @@ class UserReserveStat < ActiveRecord::Base
   default_scope {order('user_reserve_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}
   has_many :reserve_stat_has_users
-  has_many :users, :through => :reserve_stat_has_users
+  has_many :users, through: :reserve_stat_has_users
+  belongs_to :user
 
   paginates_per 10
   attr_accessor :mode
@@ -33,6 +34,7 @@ class UserReserveStat < ActiveRecord::Base
     end
     self.completed_at = Time.zone.now
     transition_to!(:completed)
+    send_message
   end
 
   private
@@ -49,10 +51,9 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #
-

data/app/models/user_reserve_stat_transition.rb

@@ -5,3 +5,16 @@ class UserReserveStatTransition < ActiveRecord::Base
   belongs_to :user_reserve_stat, inverse_of: :user_reserve_stat_transitions
   attr_accessible :to_state, :sort_key, :metadata
 end
+
+# == Schema Information
+#
+# Table name: user_reserve_stat_transitions
+#
+#  id                   :integer          not null, primary key
+#  to_state             :string(255)
+#  metadata             :text             default("{}")
+#  sort_key             :integer
+#  user_reserve_stat_id :integer
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#

data/app/views/carrier_type_has_checkout_types/_form.html.erb

@@ -3,15 +3,15 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.carrier_type') -%><br />
-    <%= f.select(:carrier_type_id, @carrier_types.collect{|m| [m.display_name.localize, m.id]}, :include_blank => true) -%>
+    <%= f.select(:carrier_type_id, @carrier_types.collect{|m| [m.display_name.localize, m.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.models.checkout_type') -%><br />
-    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}, :include_blank => true) -%>
+    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
   <div class="actions">
     <%= f.submit %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -21,7 +21,7 @@
         <%= link_to t('page.edit'), edit_carrier_type_has_checkout_type_path(carrier_type_has_checkout_type) -%>
       <% end %>
       <%- if can? :delete, carrier_type_has_checkout_type -%>
-        <%= link_to t('page.destroy'), carrier_type_has_checkout_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), carrier_type_has_checkout_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
   </tr>
@@ -34,7 +34,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, CarrierTypeHasCheckoutType -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.carrier_type_has_checkout_type')), new_carrier_type_has_checkout_type_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.carrier_type_has_checkout_type')), new_carrier_type_has_checkout_type_path -%></li>
     <% end %>
   </ul>
 </div>

data/app/views/carrier_type_has_checkout_types/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

data/app/views/carrier_types/_checkout_form.html.erb

@@ -3,7 +3,7 @@
   <%= f.fields_for :carrier_type_has_checkout_types do |checkout_form| %>
     <%= checkout_form.label :checkout_type_id -%>
     <%= checkout_form.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) %>
-    <%= checkout_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure') %>
+    <%= checkout_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure') %>
   <% end %>
   <p><%= f.link_to_add t('page.add'), :carrier_type_has_checkout_types %></p>
 </div>

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

@@ -9,11 +9,11 @@
 <%- @checked_items.each_with_index do |checked_item, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%= render 'manifestations/show_index', :manifestation => checked_item.item.manifestation -%>
+      <%= render 'manifestations/show_index', manifestation: checked_item.item.manifestation -%>
     </td>
     <td><%= link_to checked_item.item.item_identifier, checked_item.item -%></td>
-    <td><%= l(checked_item.due_date, :format => :only_date) -%></td>
-    <td><%= link_to t('page.destroy'), checked_item, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></td>
+    <td><%= l(checked_item.due_date, format: :only_date) -%></td>
+    <td><%= link_to t('page.destroy'), checked_item, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>
   </tr>
 <%- end -%>
 </table>

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

@@ -10,11 +10,11 @@
   <%- @basket.user.checkouts.not_returned.each_with_index do |checkout, i| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= render 'manifestations/show_index', :manifestation => checkout.item.manifestation -%>
-        <%= render 'manifestations/holding', :manifestation => checkout.item.manifestation -%>
+        <%= render 'manifestations/show_index', manifestation: checkout.item.manifestation -%>
+        <%= render 'manifestations/holding', manifestation: checkout.item.manifestation -%>
       </td>
       <td><%= link_to checkout.item.item_identifier, checkout.item -%></td>
-      <td><%= l(checkout.due_date, :format => :only_date) -%></td>
+      <td><%= l(checkout.due_date, format: :only_date) -%></td>
     </tr>
   <%- end -%>
 </table>

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

@@ -1,13 +1,13 @@
 <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: basket_checked_items_path(@basket), remote: true do |f| -%>
   <%= f.error_messages -%>
   <p>
     <%= f.label :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: <%= f.search_field :item_identifier -%>
     <%= f.submit t('page.read'), 'data-disable-with' => t('page.saving') -%><br />
     <%= f.label :due_date %>
-    <%= f.text_field :due_date_string, :class => 'datepicker' %>
+    <%= f.text_field :due_date_string, class: 'datepicker' %>
     <%= t('checked_item.ignore_restriction') -%>: <%= f.check_box :ignore_restriction -%>
   </p>
 <%- end -%>
@@ -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: {controller: 'baskets', action: 'update', id: @basket.id}, 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

@@ -1,4 +1,4 @@
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.checked_item')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.checked_item')) -%></h1>
 
 <%= form_for(@checked_item) do |f| -%>
   <%= f.error_messages -%>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checked_item')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.checked_item')) -%></h1>
 <div id="content_list">
   <%= render 'checked_item' %>
   <%= paginate @checked_items %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.checked_item')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.checked_item')) -%></h1>
 <div id="content_list">
 
   <div id="checked_item_list">
@@ -12,7 +12,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to @basket.user.username, @basket.user -%></li>
+    <li><%= link_to @basket.user.username, @basket.user.profile -%></li>
   </ul>
   <ul>
     <%- @basket.user.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
@@ -24,6 +24,6 @@
   </ul>
   <ul>
     <li><%= link_to t('activerecord.models.checkin'), checkins_path -%></li>
-    <li><%= link_to t('activerecord.models.reserve'), user_reserves_path(@basket.user) -%></li>
+    <li><%= link_to t('activerecord.models.reserve'), reserves_path(user_id: @basket.user.username) -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.checked_item')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.checked_item')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

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

@@ -9,7 +9,7 @@
 <%- @checkins.each_with_index do |checkin, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%= render 'manifestations/show_index', :manifestation => checkin.item.manifestation if checkin.item.try(:manifestation) -%>
+      <%= render 'manifestations/show_index', manifestation: checkin.item.manifestation if checkin.item.try(:manifestation) -%>
     </td>
     <td>
       <% if checkin.item %>
@@ -26,12 +26,12 @@
     </td>
     <td>
       <%- if checkin.checkout -%>
-        <%= l(checkin.checkout.due_date, :format => :only_date) -%>
+        <%= l(checkin.checkout.due_date, format: :only_date) -%>
       <%- end -%>
     </td>
     <td>
       <% if checkin.checkout.try(:user) %>
-        <%= link_to checkin.checkout.user.username, checkin.checkout.user -%>
+        <%= link_to checkin.checkout.user.username, checkin.checkout.user.profile -%>
       <% end %>
     </td>
   </tr>

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

@@ -1,5 +1,5 @@
 <%= simple_form_for(@checkin) do |f| %>
-  <%= f.error_notification %>
+  <%= f.error_messages %>
 
   <div class="form-inputs">
     <%= f.input :item_id %>

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

@@ -1,11 +1,11 @@
 <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: basket_checkins_path(@basket), remote: true do |f| -%>
   <%= f.error_messages %>
   <p>
     <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
-    <%= f.search_field :item_identifier, :class => 'resource_item_identifier' -%>
+    <%= f.search_field :item_identifier, class: 'resource_item_identifier' -%>
     <%= f.submit t('checkin.checkin'), 'data-disable-with' => t('page.saving') -%>
   </p>
 <%- end -%>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.checkin')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.checkin')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checkin')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.checkin')) -%></h1>
 <div id="content_list">
   <%= render 'checkin' %>
   <%= paginate @checkins %>
@@ -8,7 +8,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.checkin')), new_checkin_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.checkin')), new_checkin_path -%></li>
     <li><%= link_to t('activerecord.models.checkout'), new_basket_path -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.checkin')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.checkin')) -%></h1>
 <div id="content_list">
   <div id="checkin_list">
     <p id="notice"><%= notice %></p>
@@ -10,7 +10,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.checkout')), new_basket_path -%></li>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.checkin')), checkins_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.checkout')), new_basket_path -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.checkin')), checkins_path -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.checkin')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.checkin')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

data/app/views/checkout_types/_form.html.erb

@@ -1,5 +1,5 @@
-<%= simple_form_for(@checkout_type, :validate => true) do |f| %>
-  <%= f.error_notification %>
+<%= simple_form_for(@checkout_type, validate: true) do |f| %>
+  <%= f.error_messages %>
 
   <div class="field">
     <%= f.label :name %><br />

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.checkout_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.checkout_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_checkout_type_path(checkout_type) -%>
       <% end %>
       <%- if can? :delete, checkout_type -%>
-        <%= link_to t('page.destroy'), checkout_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), checkout_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
   </tr>
@@ -40,9 +40,9 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @user_group -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.user_group_has_checkout_type')), new_user_group_user_group_has_checkout_type_path(@user_group) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_user_group_user_group_has_checkout_type_path(@user_group) -%></li>
     <%- else -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.checkout_type')), new_checkout_type_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.checkout_type')), new_checkout_type_path -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/checkout_types/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.checkout_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.checkout_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -33,6 +33,6 @@
   <ul>
     <li><%= link_to t('page.edit'), edit_checkout_type_path(@checkout_type) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.user_group_has_checkout_type')), new_checkout_type_user_group_has_checkout_type_path(@checkout_type) -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_checkout_type_user_group_has_checkout_type_path(@checkout_type) -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checkout')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.checkout')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 <%= render 'list' -%>
@@ -13,18 +13,18 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('checkout.my_checkout'), user_checkouts_path(current_user) -%></li>
-    <li><%= link_to t('page.overdue'), checkouts_path(:view => 'overdue') -%></li>
+    <li><%= link_to t('checkout.my_checkout'), checkouts_path(user_id: current_user.username) -%></li>
+    <li><%= link_to t('page.overdue'), checkouts_path(view: 'overdue') -%></li>
   </ul>
   <%= render 'reserved_facet' %>
   <ul>
     <li>
-      <%= link_to 'RSS', checkouts_path(:format => :rss) -%>
-      <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), checkouts_path(:format => :rss) -%>
+      <%= link_to 'RSS', checkouts_path(format: :rss) -%>
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(format: :rss) -%>
     </li>
     <li>
-      <%= link_to 'CSV', checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), checkouts_path(:format => :csv, :locale => @locale.to_s) -%>
+      <%= link_to 'TSV', checkouts_path(format: :txt, locale: @locale.to_s) -%>
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(format: :txt, locale: @locale.to_s) -%>
     </li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checkout')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.checkout')) -%></h1>
 <div id="content_list">
   <p id="notice"><%= notice %></p>
 
@@ -18,12 +18,12 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <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) -%>
+      <%= 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) -%>
+      <%= link_to 'TSV', item_checkouts_path(item, format: :txt, locale: @locale.to_s) -%>
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), item_checkouts_path(item, format: :txt, locale: @locale.to_s) -%>
     </li>
   </ul>
 </div>

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

@@ -2,10 +2,10 @@
 <h1 class="title"><%= t('checkout.listing_overdue_item') -%></h1>
 <div id="content_list">
 
-  <%= form_for(:checkouts, :url => checkouts_path, :html => {:method => 'get'}) do -%>
+  <%= form_for(:checkouts, url: checkouts_path, html: {method: 'get'}) do -%>
     <p>
       <%= t('checkout.number_of_day_overdue') -%>:
-      <%= text_field_tag 'days_overdue', h(@days_overdue), :class => 'resource_integer' -%>
+      <%= text_field_tag 'days_overdue', h(@days_overdue), class: 'resource_integer' -%>
       <%= hidden_field_tag 'view', 'overdue' -%>
       <%= submit_tag t('page.search') -%>
     </p>
@@ -22,13 +22,13 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.back_to', :model => t('activerecord.models.checkout')), checkouts_path -%></li>
+    <li><%= link_to t('page.back_to', model: t('activerecord.models.checkout')), checkouts_path -%></li>
   </ul>
   <%= render 'reserved_facet' %>
   <p>
-    <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), checkouts_path(:format => :rss, :view => 'overdue') -%>
-    (<%= link_to 'RSS', checkouts_path(:format => :rss, :view => 'overdue') -%>)
-    <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), checkouts_path(:format => :csv, :view => 'overdue', :locale => @locale.to_s) -%>
-    (<%= link_to 'CSV', checkouts_path(:format => :csv, :view => 'overdue', :locale => @locale.to_s) -%>)
+    <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(format: :rss, view: 'overdue') -%>
+    (<%= link_to 'RSS', checkouts_path(format: :rss, view: 'overdue') -%>)
+    <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(format: :txt, view: 'overdue', locale: @locale.to_s) -%>
+    (<%= link_to 'TSV', checkouts_path(format: :txt, view: 'overdue', locale: @locale.to_s) -%>)
   </p>
 </div>