enju_biblio 0.1.3 → 0.2.0.beta.1

data/app/views/manifestations/_index_form_manifestation.html.erb

@@ -1,9 +1,9 @@
-<%= form_for :manifestations, url: manifestation_manifestations_path(@manifestation), html: {method: 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path(manifestation_id: @manifestation.id), html: {method: 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :create, ManifestationRelationship %>
+    <% if policy(ManifestationRelationship).create? %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_index_form_parent.html.erb

@@ -16,7 +16,7 @@
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'parent_id', @parent.id -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :update, @parent %>
+    <% if policy(@parent).update? %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_index_form_publisher.html.erb

@@ -1,10 +1,10 @@
 <div class="search_form">
-<%= form_for :manifestations, url: publisher_manifestations_path(@index_agent[:publisher]), html: {method: 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path(publisher_id: @index_agent[:publisher].id), html: {method: 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :create, Produce %>
+    <% if policy(Produce).create? %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_index_form_series_statement.html.erb

@@ -4,12 +4,12 @@
 </h2>
 
 <div class="search_form">
-<%= form_for :manifestations, url: series_statement_manifestations_path(@series_statement), html: {method: 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path(series_staetment_id: @series_statement.id), html: {method: 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :create, Manifestation %>
+    <% if policy(Manifestation).create? %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_language_facet.html.erb

@@ -11,6 +11,6 @@
     <%- end -%>
   <%- end -%>
   <%- if params[:language] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(language: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(language: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

data/app/views/manifestations/_library_facet.html.erb

@@ -6,6 +6,6 @@
     <%= library_facet(current_libraries, facet) %>
   <%- end -%>
   <%- if params[:library] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(library: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(library: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

data/app/views/manifestations/_manifestation.html.erb

@@ -21,17 +21,21 @@
                     <%- if reserve -%>
                       <%= link_to t('reserve.show'), reserve -%><br />
                     <%- else -%>
-                      <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%><br />
+                      <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if policy(Reserve).create? -%><br />
                     <%- end -%>
                   <% end %>
                 <% end %>
               <% end %>
-              <%- if can? :update, manifestation -%>
+              <%- if policy(manifestation).update? -%>
                 <% unless params[:mode] == 'add' %>
                   <% if manifestation.serial? && manifestation.series_master? %>
                     <%= link_to t('page.new_acquisition'), new_manifestation_path(parent_id: manifestation.id) %>
                   <% end %>
                   <%= link_to t('page.edit'), edit_manifestation_path(manifestation) -%>
+                  <%- if policy(Item).create? and not manifestation.series_master? -%>
+                    <br />
+                    <%= link_to t('page.new_item'), new_item_path(manifestation_id: manifestation.id) -%>
+                  <%- end -%>
                 <% else %>
                   <% case %>
                   <% when @parent %>

data/app/views/manifestations/_manifestation.txt.erb

@@ -1 +1 @@
-<%= manifestation.manifestation_identifier %>	"<%=raw manifestation.original_title.gsub(/"/, '""') -%>"	<%=raw manifestation.creators.pluck(:full_name).join('; ') -%>	<%=raw manifestation.publishers.pluck(:full_name).join('; ') -%>	<%= manifestation.identifier_contents(:isbn) -%>	<%= manifestation.pub_date -%>	<%= manifestation.note -%><%= "\n" -%>
+<%= manifestation.to_csv(format: :txt, role: current_user_role_name) -%>

data/app/views/manifestations/_paginate_id_store.html.erb

@@ -6,12 +6,14 @@
       }else{
         var ids = JSON.parse(sessionStorage.getItem("<%= flash[:search_query] %>"));
         var index = $.inArray(<%= manifestation.id %>, ids);
-        if(ids[index - 1] > 0){
-          $("#prev_link").html('<a href="<%= manifestations_path %>/' + ids[index - 1] + '"><%= t('page.previous') %></a>');
-        };
-        if(ids[index + 1] > 0){
-          $("#next_link").html('<a href="<%= manifestations_path %>/' + ids[index + 1] + '"><%= t('page.next') %></a>');
-        };
+        if (index != -1) {
+          if (ids[index - 1] > 0) {
+            $("#prev_link").html('<a href="<%= manifestations_path %>/' + ids[index - 1] + '"><%= t('page.previous') %></a>');
+          };
+          if (ids[index + 1] > 0) {
+            $("#next_link").html('<a href="<%= manifestations_path %>/' + ids[index + 1] + '"><%= t('page.next') %></a>');
+          };
+        }
       };
     });
   </script>

data/app/views/manifestations/_pub_year_facet.html.erb

@@ -6,6 +6,6 @@
     </li>
   <%- end -%>
   <%- if params[:pub_date_from] and params[:pub_date_until] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(pub_date_from: nil, pub_date_until: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(pub_date_from: nil, pub_date_until: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

data/app/views/manifestations/_publisher_fields.html.erb

@@ -0,0 +1,4 @@
+<div class="nested-fields">
+  <%= f.text_field :full_name, class: 'resource_name' %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

data/app/views/manifestations/_reservable_facet.html.erb

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

data/app/views/manifestations/_series_statement_fields.html.erb

@@ -0,0 +1,13 @@
+<div class="nested-fields">
+  <%= f.label :original_title %>
+  <%= f.text_field :original_title, class: 'resource_title' %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+  <%= f.label :title_transcription %>
+  <%= f.text_field :title_transcription, class: 'resource_title' %><br />
+  <%= f.label :volume_number_string %>
+  <%= f.text_field :volume_number_string %><br />
+  <%= f.label :creator_string %>
+  <%= f.text_field :creator_string, class: 'resource_name' %><br />
+  <%= f.label :series_master %>
+  <%= f.check_box :series_master %>
+</div>

data/app/views/manifestations/_show.rdf.builder

@@ -1,87 +1,3 @@
-    xml.titleInfo{
-      xml.title manifestation.original_title
-    }
-    xml.titleInfo('type' => 'alternative'){
-      xml.title manifestation.title_alternative
-    }
-    manifestation.creators.readable_by(current_user).each do |creator|
-      case creator.agent_type.name
-      when "person"
-        xml.name('type' => 'personal'){
-          xml.namePart creator.full_name
-          xml.namePart creator.date if creator.date
-          xml.role do
-            xml.roleTerm "creator", 'type' => 'text', 'authority' => 'marcrelator'
-          end
-        }
-      when "corporate_body"
-        xml.name('type' => 'corporate'){
-          xml.namePart creator.full_name
-          xml.role do
-            xml.roleTerm "creator", 'type' => 'text', 'authority' => 'marcrelator'
-          end
-        }
-      when "conference"
-        xml.name('type' => 'conference'){
-          xml.namePart creator.full_name
-          xml.role do
-            xml.roleTerm "creator", 'type' => 'text', 'authority' => 'marcrelator'
-          end
-        }
-      end
-    end
-    manifestation.contributors.readable_by(current_user).each do |contributor|
-      case contributor.agent_type.name
-      when "person"
-        xml.name('type' => 'personal'){
-          xml.namePart contributor.full_name
-          xml.namePart contributor.date if contributor.date
-        }
-      when "corporate_body"
-        xml.name('type' => 'corporate'){
-          xml.namePart contributor.full_name
-        }
-      when "conference"
-        xml.name('type' => 'conference'){
-          xml.namePart contributor.full_name
-        }
-      end
-    end
-    xml.typeOfResource manifestation.carrier_type.mods_type
-    xml.originInfo{
-      manifestation.publishers.readable_by(current_user).each do |agent|
-        xml.publisher agent.full_name
-      end
-      xml.dateIssued manifestation.date_of_publication
-      xml.frequency manifestation.frequency.name
-    }
-    xml.language{
-      xml.languageTerm manifestation.language.iso_639_2, 'authority' => 'iso639-2b', 'type' => 'code' if manifestation.language
-    }
-    xml.physicalDescription{
-      xml.form manifestation.carrier_type.name, 'authority' => 'marcform'
-      xml.extent manifestation.extent
-    }
-    if defined?(EnjuSubject)
-      xml.subject{
-        manifestation.subjects.each do |subject|
-          xml.topic subject.term
-        end
-      }
-      manifestation.classifications.each do |classification|
-        xml.classification classification.category, 'authority' => classification.classification_type.name
-      end
-    end
-    xml.abstract manifestation.description
-    xml.note manifestation.note
-    manifestation.identifier_contents(:isbn).each do |i|
-      xml.identifier i, type: 'isbn'
-    end
-    manifestation.identifier_contents(:lccn).each do |l|
-      xml.identifier l, type: 'lccn'
-    end
-    xml.recordInfo{
-      xml.recordCreationDate manifestation.created_at
-      xml.recordChangeDate manifestation.updated_at
-      xml.recordIdentifier manifestation_url(manifestation)
-    }
+    xml.title manifestation.original_title
+    xml.link manifestation_url(manifestation)
+    xml.description [ agents_list(manifestation.publishers, nolink: true), manifestation.pub_date, manifestation.description ].reject(&:blank?).join("; ")

data/app/views/manifestations/_show_creators.html.erb

@@ -16,7 +16,6 @@
     (<%= manifestation.pub_date -%>)
   <%- end -%>
   <% if defined?(EnjuSubject) %>
-    <%= ';' if manifestation.classifications.count >= 1 %>
     <% manifestation.classifications.each_with_index do |classification| %>
       <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
     <% end %>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -66,27 +66,25 @@
             </td>
           </tr>
         <% end %>
-        <%- unless manifestation.serial? -%>
-          <tr>
-            <td><%= t('page.identifier') -%>:</td>
-            <td>
-              <ul>
-                <% manifestation.identifiers.each do |identifier| %>
-                  <li>
-                    <%= identifier.identifier_type.display_name.localize %>:
-                    <%= identifier_link(identifier) %>
-                  </li>
-                <% end %>
-                <% if manifestation.manifestation_identifier %>
-                  <li>
-                    <%= t('activerecord.attributes.manifestation.manifestation_identifier') %>:
-                    <%= manifestation.manifestation_identifier %>
-                  </li>
-                <% end %>
-              </ul>
-            </td>
-          </tr>
-        <%- end -%>
+        <tr>
+          <td><%= t('page.identifier') -%>:</td>
+          <td>
+            <ul>
+              <% manifestation.identifiers.each do |identifier| %>
+                <li>
+                  <%= identifier.identifier_type.display_name.localize %>:
+                  <%= identifier_link(identifier) %>
+                </li>
+              <% end %>
+              <% if manifestation.manifestation_identifier %>
+                <li>
+                  <%= t('activerecord.attributes.manifestation.manifestation_identifier') %>:
+                  <%= manifestation.manifestation_identifier %>
+                </li>
+              <% end %>
+            </ul>
+          </td>
+        </tr>
         <%- unless manifestation.attachment_file_name.blank? -%>
           <%= render 'manifestations/attachment_file', manifestation: manifestation -%>
         <%- end -%>
@@ -115,7 +113,7 @@
     <%- if manifestation.items.exists? -%>
       <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items %>
     <%- end -%>
-    <%- if can? :create, Item -%>
+    <%- if policy(Item).create? -%>
       <p><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: manifestation.id) -%></p>
     <%- end -%>
     <%= render 'manifestations/tab_list', manifestation: manifestation %>

data/app/views/manifestations/_show_detail_user.html.erb

@@ -68,21 +68,19 @@
             </td>
           </tr>
         <% end %>
-        <%- unless manifestation.serial? -%>
-          <tr>
-            <td><%= t('page.identifier') -%>:</td>
-            <td>
-              <ul>
-                <% manifestation.identifiers.each do |identifier| %>
-                  <li>
-                    <%= identifier.identifier_type.display_name.localize %>:
-                    <%= identifier_link(identifier) %>
-                  </li>
-                <% end %>
-              </ul>
-            </td>
-          </tr>
-        <%- end -%>
+        <tr>
+          <td><%= t('page.identifier') -%>:</td>
+          <td>
+            <ul>
+              <% manifestation.identifiers.each do |identifier| %>
+                <li>
+                  <%= identifier.identifier_type.display_name.localize %>:
+                  <%= identifier_link(identifier) %>
+                </li>
+              <% end %>
+            </ul>
+          </td>
+        </tr>
         <%- unless manifestation.attachment_file_name.blank? -%>
           <%= render 'manifestations/attachment_file', manifestation: manifestation -%>
         <%- end -%>

data/app/views/manifestations/_show_holding.html.erb

@@ -46,7 +46,7 @@
         </td>
       <% end %>
     </tr>
-    <% if can? :update, item %>
+    <% if policy(item).update? %>
       <script>
         $(function(){
           $('a#item_identifier_item_<%= item.id %>').data(

data/app/views/manifestations/_submenu_parent.html.erb

@@ -1,11 +1,11 @@
   <ul>
-    <% if can? :create, Manifestation %>
+    <% if policy(Manifestation).create? %>
       <li><%= link_to t('page.new', model: t('activerecord.models.manifestation')), new_manifestation_path(parent_id: @parent.id) %></li>
     <% end %>
-    <% if can? :update, @parent %>
+    <% if policy(@parent).update? %>
       <li><%= link_to t('page.edit'), edit_manifestation_path(@parent) %></li>
     <% end %>
-    <% if can? :delete, @parent %>
+    <% if policy(@parent).destroy? %>
       <li><%= link_to t('page.destroy'), manifestation_path(@parent), data: {confirm: t('page.are_you_sure')}, method: :delete %></li>
     <% end %>
   </ul>

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

@@ -9,13 +9,9 @@
   <%= render 'manifestations/book_jacket', manifestation: @manifestation -%>
   <ul>
     <li><%= link_to t('page.show'), @manifestation -%></li>
-    <% if can? :delete, @manifestation %>
+    <% if policy(@manifestation).destroy? %>
       <li><%= link_to t('page.destroy'), @manifestation, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
-    <%- case when @agent -%>
-      <li><%= link_to t('page.back'), publisher_manifestations_path(@agent) -%></li>
-    <%- else -%>
-      <li><%= link_to t('page.back'), manifestations_path -%></li>
-    <%- end -%>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

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

@@ -35,24 +35,36 @@
       <%- end -%>
     </p>
 
-    <p>
-      <%= t('page.sort_by') -%>:
-      <%- if params[:sort_by].blank? -%>
-        <strong><%= t('manifestation.date_of_acquisition') -%></strong>
-      <%- else -%>
-        <%= link_to t('manifestation.date_of_acquisition'), url_for(params.merge(sort_by: nil, only_path: true)) -%>
-      <%- end -%>
-      <%- if params[:sort_by] == 'pub_date' -%>
-        <strong><%= t('activerecord.attributes.manifestation.date_of_publication') -%></strong>
-      <%- else -%>
-        <%= link_to t('activerecord.attributes.manifestation.date_of_publication'), url_for(params.merge(sort_by: 'pub_date', only_path: true)) -%>
+    <div class="field right">
+      <%= form_for :manifestations, url: manifestations_path, html: {method: 'get'} do -%>
+        <p>
+          <%= select_tag 'per_page', options_for_select({
+            t('page.per_page', num: 10) => 10,
+            t('page.per_page', num: 20) => 20,
+            t('page.per_page', num: 50) => 50,
+            t('page.per_page', num: 100) => 100,
+          }, selected: params[:per_page]) %>
+          <%= select_tag 'sort_by', options_for_select({
+            [t('page.sort_criteria.created_at'),
+              t('page.sort_criteria.date_desc')].join(" : ") => 'created_at:desc',
+            [t('page.sort_criteria.created_at'),
+              t('page.sort_criteria.date_asc')].join(" : ") => 'created_at:asc',
+            [t('activerecord.attributes.manifestation.pub_date'),
+              t('page.sort_criteria.date_desc')].join(" : ") => 'pub_date:desc',
+            [t('activerecord.attributes.manifestation.pub_date'),
+              t('page.sort_criteria.date_asc')].join(" : ") => 'pub_date:asc',
+            [t('page.score'),
+              t('page.sort_criteria.score_desc')].join(" : ") => 'score:desc',
+            [t('page.title'),
+              t('page.sort_criteria.title_asc')].join(" : ") => 'title:asc',
+            [t('page.title'),
+              t('page.sort_criteria.title_desc')].join(" : ") => 'title:desc',
+          }, selected: params[:sort_by] || 'created_at:desc') -%>
+          <%= hidden_field_tag 'query', @query -%>
+          <%= submit_tag t('page.show') -%><br />
+        </p>
       <%- end -%>
-      <%- if params[:sort_by] == 'title' -%>
-        <strong><%= t('page.title') -%></strong>
-      <%- else -%>
-        <%= link_to t('page.title'), url_for(params.merge(sort_by: 'title', only_path: true)) -%>
-      <%- end -%>
-    </p>
+    </div>
 
     <div class="autopagerize_page_element" id="list">
       <table class="table table-striped index" id="manifestation_list">
@@ -71,8 +83,12 @@
       </div>
     <% end %>
   <%- else -%>
-    <!-- TODO: 検索結果が少ない場合にも表示させる -->
-    <%= render 'manifestations/not_found' -%>
+    <%- if @parent -%>
+      <p><%= t('manifestation.record_not_added') %></p>
+    <%- else -%>
+      <!-- TODO: 検索結果が少ない場合にも表示させる -->
+      <%= render 'manifestations/not_found' -%>
+    <%- end -%>
   <%- end -%>
 
     <div class="autopagerize_insert_before"></div>
@@ -81,18 +97,18 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <% if @parent and can?(:update, @parent) %>
+  <% if @parent and policy(@parent).update? %>
     <%= render 'submenu_parent' %>
   <% end %>
-  <h3><%= link_to h("#{t('page.total')}: #{@count[:query_result]}"), url_for(params.merge(action: 'index', view: nil, carrier_type: nil, library: nil, language: nil, subject: nil, only_path: true))  -%></h3>
+  <h3><%= link_to h("#{t('page.total')}: #{@count[:query_result]}"), url_for(params.permit.merge(action: 'index', view: nil, carrier_type: nil, library: nil, language: nil, subject: nil, only_path: true))  -%></h3>
     <%- if @manifestations.total_count > 0 -%>
       <%= render 'manifestations/all_facet' -%>
     <%- end -%>
   <div>
     <%- if params[:library_id].blank? -%>
-      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.merge(format: :rss, page: nil, library_id: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(format: :rss, page: nil, library_id: nil, commit: nil, only_path: true)) -%>
+      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.permit.merge(format: :rss, page: nil, library_id: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.permit.merge(format: :rss, page: nil, library_id: nil, commit: nil, only_path: true)) -%>
     <%- else -%>
-      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(format: :rss, page: nil, commit: nil, only_path: true)) -%>
+      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.permit.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.permit.merge(format: :rss, page: nil, commit: nil, only_path: true)) -%>
     <%- end -%>
   </div>
   <%= render 'manifestations/export_list' %>
@@ -101,7 +117,7 @@
 <% if defined?(EnjuBookmark) %>
   <script type="text/javascript">
     window.onload = function() {
-      $("#tag_cloud_list").load('<%= url_for(params.merge(view: "tag_cloud", only_path: true)) -%>', hideTagCloudSpinner);
+      $("#tag_cloud_list").load('<%= url_for(params.permit.merge(view: "tag_cloud", only_path: true)) -%>', hideTagCloudSpinner);
     }
 
     function hideTagCloudSpinner(){

data/app/views/manifestations/index.rdf.builder

@@ -8,9 +8,9 @@ xml.rdf(:RDF,
         'xmlns:foaf' => "http://xmlns.com/foaf/0.1/",
         'xmlns:prism' => "http://prismstandard.org/namespaces/basic/2.0/",
         'xmlns:rdfs' =>"http://www.w3.org/2000/01/rdf-schema#"){
-  xml.channel("rdf:about" => manifestations_url(params: params.merge(format: 'rdf', only_path: true))){
+  xml.channel("rdf:about" => manifestations_url(params: params.permit.merge(format: 'rdf', only_path: true))){
     xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
@@ -25,6 +25,8 @@ xml.rdf(:RDF,
     end
   }
   @manifestations.each do |manifestation|
-    xml << render('manifestations/show', manifestation: manifestation)
+    xml.item('rdf:about' => manifestation_url(manifestation)) do
+      xml << render('manifestations/show', manifestation: manifestation)
+    end
   end
 }

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

@@ -5,11 +5,11 @@ xml.rss('version' => "2.0",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    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: manifestations_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     unless params[:query].blank?

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

@@ -1,2 +1 @@
-manifestation_identifier	original_title	creator	publisher	isbn	pub_date	note
-<%= render @manifestations %>
+<%= Manifestation.csv_header(current_user_role_name, col_sep: "\t") -%><%= render @manifestations -%>

data/app/views/manifestations/{show.mobile.erb → show.html+phone.erb}

@@ -15,6 +15,6 @@
 </tr>
 </table>
 <%- if @manifestation.items.for_checkout.on_shelf.exists? -%>
-  <%= render 'manifestations/show_holding', manifestation: @manifestation -%>
+  <%= render 'manifestations/show_holding', manifestation: @manifestation, items: @manifestation.items.for_checkout.on_shelf %>
 <%- end -%>
 </div>

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

@@ -23,7 +23,7 @@
       <li><%= t('page.total') %>: <%= @manifestation.picture_files.count %> <%= t('page.number_of_pictures', count: @manifestation.picture_files.count) %></li>
       <li><%= link_to t('page.listing', model: t('activerecord.models.picture_file')), picture_files_path(manifestation_id: @manifestation.id) -%></li>
     <% end %>
-    <%- if can? :create, PictureFile -%>
+    <%- if policy(PictureFile).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(manifestation_id: @manifestation.id) -%></li>
     <%- end -%>
   </ul>

data/app/views/manifestations/show.txt.erb

@@ -1,2 +1 @@
-manifestation_identifier	original_title	creator	publisher	isbn	pub_date	note
-<%= render @manifestation %>
+<%= Manifestation.csv_header(current_user_role_name, col_sep: "\t") -%><%= render @manifestation -%>

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

@@ -18,7 +18,7 @@
 <%- @medium_of_performances.each do |medium_of_performance| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, medium_of_performance -%>
+      <%- if policy(medium_of_performance).update? -%>
         <%= move_position(medium_of_performance) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= medium_of_performance.note %>
     </td>
     <td>
-      <%- if can? :update, medium_of_performance -%>
+      <%- if policy(medium_of_performance).update? -%>
         <%= link_to t('page.edit'), edit_medium_of_performance_path(medium_of_performance) -%>
       <% end %>
-      <%- if can? :delete, medium_of_performance -%>
+      <%- if policy(medium_of_performance).destroy? -%>
         <%= link_to t('page.destroy'), medium_of_performance_path(medium_of_performance), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, MediumOfPerformance -%>
+    <%- if policy(MediumOfPerformance).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.medium_of_performance')), new_medium_of_performance_path -%></li>
     <%- end -%>
   </ul>