enju_circulation 0.1.2 → 0.2.0.beta.1

data/app/policies/item_has_use_restriction_policy.rb

@@ -0,0 +1,21 @@
+class ItemHasUseRestrictionPolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Administrator')
+  end
+end

data/app/policies/item_policy.rb

@@ -0,0 +1,27 @@
+class ItemPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def edit?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    if user.try(:has_role?, 'Librarian')
+      record.removable?
+    end
+  end
+end

data/app/policies/lending_policy_policy.rb

@@ -0,0 +1,21 @@
+class LendingPolicyPolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    false
+  end
+
+  def update?
+    user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Administrator')
+  end
+end

data/app/policies/manifestation_checkout_stat_policy.rb

@@ -0,0 +1,21 @@
+class ManifestationCheckoutStatPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/manifestation_reserve_stat_policy.rb

@@ -0,0 +1,21 @@
+class ManifestationReserveStatPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/reserve_policy.rb

@@ -0,0 +1,37 @@
+class ReservePolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'User')
+  end
+
+  def show?
+    if user.try(:has_role?, 'Librarian')
+      true
+    elsif user and user == record.user
+      true
+    end
+  end
+
+  def create?
+    if user.try(:has_role?, 'Librarian')
+      true
+    elsif user.try(:has_role?, 'User')
+      true if user.profile.user_number.try(:present?)
+    end
+  end
+
+  def update?
+    if user.try(:has_role?, 'Librarian')
+      true
+    elsif user and user == record.user
+      true
+    end
+  end
+
+  def destroy?
+    if user.try(:has_role?, 'Librarian')
+      true
+    elsif user and user == record.user
+      true
+    end
+  end
+end

data/app/policies/use_restriction_policy.rb

@@ -0,0 +1,23 @@
+class UseRestrictionPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    false
+  end
+
+  def update?
+    if user.try(:has_role?, 'Administrator')
+      true
+    end
+  end
+
+  def destroy?
+    false
+  end
+end

data/app/policies/user_checkout_stat_policy.rb

@@ -0,0 +1,21 @@
+class UserCheckoutStatPolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Administrator')
+  end
+end

data/app/policies/user_group_has_checkout_type_policy.rb

@@ -0,0 +1,21 @@
+class UserGroupHasCheckoutTypePolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Administrator')
+  end
+end

data/app/policies/user_reserve_stat_policy.rb

@@ -0,0 +1,21 @@
+class UserReserveStatPolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Administrator')
+  end
+end

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

@@ -17,10 +17,10 @@
     <td><%= carrier_type_has_checkout_type.note -%></td>
     <td>
       <%= link_to t('page.show'), carrier_type_has_checkout_type -%>
-      <%- if can? :update, carrier_type_has_checkout_type -%>
+      <%- if policy(carrier_type_has_checkout_type).update? -%>
         <%= 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 -%>
+      <%- if policy(carrier_type_has_checkout_type).destroy? -%>
         <%= link_to t('page.destroy'), carrier_type_has_checkout_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
@@ -33,7 +33,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, CarrierTypeHasCheckoutType -%>
+    <%- if policy(CarrierTypeHasCheckoutType).create? -%>
       <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>

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

@@ -23,7 +23,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <% if can?(:update, @carrier_type_has_checkout_type) %>
+    <% if policy(@carrier_type_has_checkout_type).update? %>
       <li><%= link_to t('page.edit'), edit_carrier_type_has_checkout_type_path(@carrier_type_has_checkout_type) -%></li>
     <% end %>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -0,0 +1,5 @@
+<div class="nested-fields">
+  <%= f.label :checkout_type_id -%>
+  <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) %>
+  <%= f.link_to_remove t('page.remove'), data: {confirm: t('page.are_you_sure')} %>
+</div>

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

@@ -1,9 +1,7 @@
 <div class="field">
   <%= f.label t('activerecord.models.carrier_type_has_checkout_type') %><br />
   <%= 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') %>
+    <%= render 'carrier_type_has_checkout_type_fields', f: checkout_form %>
   <% end %>
-  <p><%= f.link_to_add t('page.add'), :carrier_type_has_checkout_types %></p>
+  <p><%= link_to_add_association t('page.add'), f, :carrier_type_has_checkout_types %></p>
 </div>

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

@@ -17,7 +17,7 @@
 <%- @checkout_types.each do |checkout_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, checkout_type -%>
+      <%- if policy(checkout_type).update? -%>
         <%= move_position(checkout_type) -%>
       <%- end -%>
     </td>
@@ -28,10 +28,10 @@
       <%= checkout_type.note %>
     </td>
     <td>
-      <%- if can? :update, checkout_type -%>
+      <%- if policy(checkout_type).update? -%>
         <%= link_to t('page.edit'), edit_checkout_type_path(checkout_type) -%>
       <% end %>
-      <%- if can? :delete, checkout_type -%>
+      <%- if policy(checkout_type).destroy? -%>
         <%= link_to t('page.destroy'), checkout_type_path(checkout_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -44,7 +44,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, CheckoutType -%>
+    <%- if policy(CheckoutType).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.checkout_type')), new_checkout_type_path -%></li>
     <%- end -%>
   </ul>

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

@@ -31,11 +31,11 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @checkout_type -%>
+    <%- if policy(@checkout_type).update? -%>
       <li><%= link_to t('page.edit'), edit_checkout_type_path(@checkout_type) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    <%- if can? :create, UserGroupHasCheckoutType -%>
+    <%- if policy(UserGroupHasCheckoutType).create? -%>
       <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>
     <%- end -%>
   </ul>

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

@@ -14,7 +14,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <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>
+    <li><%= link_to t('page.overdue'), checkouts_path(days_overdue: 1) -%></li>
   </ul>
   <%= render 'reserved_facet' %>
   <h4><%= t('page.other_format') %></h4>

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

@@ -6,7 +6,6 @@
     <p>
       <%= t('checkout.number_of_day_overdue') -%>:
       <%= text_field_tag 'days_overdue', h(@days_overdue), class: 'resource_integer' -%>
-      <%= hidden_field_tag 'view', 'overdue' -%>
       <%= submit_tag t('page.search') -%>
     </p>
   <%- end -%>
@@ -28,12 +27,12 @@
   <h4><%= t('page.other_format') %></h4>
   <ul>
     <li>
-      <%= link_to 'RSS', checkouts_path(format: :rss, view: 'overdue') -%>
-      <%= 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, days_overdue: 1) -%>
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(format: :rss, days_overdue: 1) -%>
     </li>
     <li>
-      <%= link_to 'TSV', checkouts_path(format: :txt, view: 'overdue', locale: @locale.to_s) -%>
-      <%= 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, days_overdue: 1, locale: @locale.to_s) -%>
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
     </li>
   </ul>
 </div>

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

@@ -33,14 +33,14 @@
         <%= link_to (image_tag 'icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_path(user_id: user.username, format: :ics) -%>
       </li>
     <% end %>
-    <%- if params[:view] == 'overdue' -%>
+    <%- if params[:days_overdue].present? -%>
       <li>
-        <%= link_to 'RSS', checkouts_path(user_id: user.username, format: :rss, view: 'overdue') -%>
-        <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: user.username, format: :rss, view: 'overdue') -%>
+        <%= link_to 'RSS', checkouts_path(user_id: user.username, format: :rss, days_overdue: 1) -%>
+        <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: user.username, format: :rss, days_overdue: 1) -%>
       </li>
       <li>
-        <%= link_to 'TSV', checkouts_path(user_id: user.username, format: :txt, view: 'overdue', locale: @locale.to_s) -%>
-        <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: user.username, format: :txt, view: 'overdue', locale: @locale.to_s) -%>
+        <%= link_to 'TSV', checkouts_path(user_id: user.username, format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
+        <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: user.username, format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
       </li>
     <%- else -%>
       <li>

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

@@ -34,12 +34,12 @@
       <% end %>
     </td>
     <td>
-      <%- if can? :update, checkout -%>
+      <%- if policy(checkout).update? -%>
         <% unless checkout.checkin %>
           <%= link_to t('checkout.extend'), edit_checkout_path(checkout) -%>
         <% end %>
       <%- end -%>
-      <%- if can? :delete, checkout -%>
+      <%- if policy(checkout).destroy? -%>
         <%= link_to t('page.destroy'), checkout, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>

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

@@ -4,11 +4,11 @@
     <% facet.value ? facet_reserved = true : facet_reserved = false %>
     <li>
       <%- if @reserved == facet_reserved -%><strong><%- end -%>
-      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(page: nil, reserved: facet.value.to_s, view: nil, only_path: true)) -%>
+      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.permit.merge(page: nil, reserved: facet.value.to_s, view: nil, only_path: true)) -%>
       <%- if @reserved == facet_reserved -%></strong><%- end -%>
     </li>
   <%- end -%>
   <%- unless @reserved.nil? -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(reserved: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(reserved: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

@@ -45,7 +45,7 @@
   <ul>
     <li><%= link_to t('page.show'), @checkout -%></li>
     <% if @checkout.user %>
-      <li><%= link_to t('page.back'), checkouts_path(user_id: @checkout.user.username) -%></li>
+      <li><%= link_to t('page.back'), :back -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -4,14 +4,14 @@
   <% elsif @item %>
     <%= render 'index_item', item: @item -%>
   <% else %>
-    <%- if params[:view] == 'overdue' -%>
+    <%- if params[:days_overdue].present? -%>
       <%= render 'index_overdue' -%>
     <%- else -%>
       <%= render 'index' -%>
     <% end %>
   <% end %>
 <% else %>
-  <%- if params[:view] == 'overdue' -%>
+  <%- if params[:days_overdue].present? -%>
     <%= render 'index_overdue' -%>
   <%- else -%>
     <%= render 'index_user', user: current_user -%>

data/app/views/checkouts/index.rss.builder

@@ -6,12 +6,12 @@ xml.rss('version' => "2.0",
     if @user
       xml.title t('checkout.user_checkout', login_name: @user.username)
       xml.link checkouts_url(user_id: @user.username)
-      xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+      xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
       xml.tag! "atom:link", rel: 'alternate', href: checkouts_url(user_id: @user.username)
     else
       xml.title t('checkout.library_group_checkout', library_group_name: @library_group.display_name.localize)
       xml.link checkouts_url
-      xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+      xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
       xml.tag! "atom:link", rel: 'alternate', href: checkouts_url
     end
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"

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

@@ -1,4 +1,4 @@
-<%- if params[:view] == 'overdue' -%><%= 'Overdue items' -%><%- else -%><%= 'Checkout items' -%><%- end -%> (created_at: <%= Time.now -%>)<%= "\n" -%>
+<%- if params[:days_overdue].present? -%><%= 'Overdue items' -%><%- else -%><%= 'Checkout items' -%><%- end -%> (created_at: <%= Time.now -%>)<%= "\n" -%>
 <%- @checkouts.each do |checkout| -%>
 "<%=h checkout.user.try(:username) -%>"	"<%=h checkout.item.item_identifier -%>"	"<%=h checkout.item.manifestation.original_title -%>"	"<%=h checkout.created_at -%>"	"<%= checkout.due_date -%>"<%= "\n" -%>
 <%- end -%>

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

@@ -12,10 +12,16 @@
     <strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
     <%= l(@checkout.due_date, format: :only_date) if @checkout.due_date -%>
   </p>
-  <%- if can? :update, @checkout -%>
+  <%- if policy(@checkout).update? -%>
     <p>
       <strong><%= t('checkout.current_user') -%></strong><br />
-      <%= link_to @checkout.user_username, @checkout.user.profile if @checkout.user.try(:profile) -%>
+      <% if @checkout.user.try(:profile) -%>
+        <%= link_to @checkout.user_username, @checkout.user.profile if @checkout.user.try(:profile) -%>
+        (
+          <%= t('activerecord.attributes.profile.user_number') %>:
+          <%= @checkout.user.profile.user_number %>
+        )
+      <% end %>
     </p>
   <%- end -%>
 </div>
@@ -25,11 +31,9 @@
   <%= render 'manifestations/book_jacket', manifestation: @checkout.item.manifestation -%>
   <ul>
     <li><%= link_to t('page.edit'), edit_checkout_path(@checkout) -%></li>
-    <% if @checkout.user %>
-      <li><%= link_to t('page.back'), checkouts_path(user_id: @checkout.user.username) -%></li>
-    <% end %>
+    <li><%= link_to t('page.back'), :back -%></li>
     <%- if current_user.has_role?('Librarian') -%>
-      <li><%= link_to t('page.back_to', model: t('activerecord.models.checkout')), checkouts_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.checkout')), checkouts_path -%></li>
     <%- end -%>
   </ul>
 </div>

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

@@ -17,7 +17,7 @@
 <%- @circulation_statuses.each do |circulation_status| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, circulation_status -%>
+      <%- if policy(circulation_status).update? -%>
         <%= move_position(circulation_status) -%>
       <%- end -%>
     </td>
@@ -28,10 +28,10 @@
       <%= circulation_status.note %>
     </td>
     <td>
-      <%- if can? :update, circulation_status -%>
+      <%- if policy(circulation_status).update? -%>
         <%= link_to t('page.edit'), edit_circulation_status_path(circulation_status) -%>
       <% end %>
-      <%- if can? :delete, circulation_status -%>
+      <%- if policy(circulation_status).destroy? -%>
         <%= link_to t('page.destroy'), circulation_status_path(circulation_status), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -44,7 +44,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, CirculationStatus -%>
+    <%- if policy(CirculationStatus).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.circulation_status')), new_circulation_status_path -%></li>
     <%- end -%>
   </ul>

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

@@ -23,7 +23,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @circulation_status -%>
+    <%- if policy(@circulation_status).update? -%>
       <li><%= link_to t('page.edit'), edit_circulation_status_path(@circulation_status) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/reserves/_state_facet.html.erb

@@ -4,12 +4,12 @@
     <% @state_facet.each do |state| %>
       <li>
         <% if state.value == params[:state].to_s.downcase %><strong><% end %>
-        <%= link_to "#{i18n_state(state.value)} (#{state.count})", url_for(params.merge(state: state.value, page: nil, view: nil, only_path: true)) %>
+        <%= link_to "#{i18n_state(state.value)} (#{state.count})", url_for(params.permit.merge(state: state.value, page: nil, view: nil, only_path: true)) %>
         <% if state.value == params[:state].to_s.downcase %></strong><% end %>
       </li>
     <% end %>
     <%- if params[:state] -%>
-      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(state: nil, page: nil, view: nil, only_path: true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(state: nil, page: nil, view: nil, only_path: true)) -%></li>
     <%- end -%>
   </ul>
 <%- end -%>

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

@@ -21,12 +21,12 @@
   <%- if @sort_by == :created_at -%>
     <strong><%= t('activerecord.attributes.reserve.created_at') -%></strong>
   <%- else -%>
-    <%= link_to t('activerecord.attributes.reserve.created_at'), url_for(params.merge(sort_by: nil, only_path: true)) -%>
+    <%= link_to t('activerecord.attributes.reserve.created_at'), url_for(params.permit.merge(sort_by: nil, only_path: true)) -%>
   <% end %>
   <%- if @sort_by == :title -%>
     <strong><%= t('page.title') -%></strong>
   <%- else -%>
-    <%= link_to t('page.title'), url_for(params.merge(sort_by: 'title', only_path: true)) -%>
+    <%= link_to t('page.title'), url_for(params.permit.merge(sort_by: 'title', only_path: true)) -%>
   <%- end -%>
 </p>
 
@@ -35,7 +35,7 @@
     <th style="width: 30px">Id</th>
     <th><%= t('activerecord.models.manifestation') -%></th>
     <th style="width: 80px"><%= t('activerecord.attributes.reserve.state') -%></th>
-    <%- if can? :update, @reserves.first -%>
+    <%- if policy(Reserve).create? -%>
       <th style="width: 70px"></th>
     <% end %>
   </tr>
@@ -61,13 +61,15 @@
       <% end %>
     </td>
     <td>
-      <%- if can? :delete, reserve -%>
+      <%- if policy(reserve).update? -%>
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>
         <%- if reserve.user.reserves.waiting.include?(reserve) -%>
           <br />
           <%= link_to t('page.cancel'), reserve_path(reserve, mode: 'cancel'), data: {confirm: t('page.are_you_sure')}, method: :put -%>
         <%- else -%>
           <br />
+      <% end %>
+      <%- if policy(reserve).destroy? -%>
           <%= link_to t('page.destroy'), reserve, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       <%- end -%>

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

@@ -73,7 +73,7 @@
     <%- else -%>
       <li><%= link_to t('page.destroy'), @reserve, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <%- end -%>
-    <li><%= link_to t('page.back'), reserves_path(page: flash[:page] ||= nil) -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path %></li>
   </ul>
   <!--
   <p>TODO: 予約取り消し時に、次の予約者に連絡する</p>