enju_biblio 0.1.0.pre23 → 0.1.0.pre24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851b384f2c1744c595dfcbb4fd82bb8cd4d00576
-  data.tar.gz: 6bb9b6d4286ebff9e25fcd3afde173539ee3f713
+  metadata.gz: 9c7e8c426db79659c9a4c685afc0ca3181ed949a
+  data.tar.gz: 1ba4bdfcc16a10619c3e97b89dd333177c804531
 SHA512:
-  metadata.gz: 4b6158f5e071dae93770850c337a636a6afdd32bcdc1104ce3fefc1c99cc98824ba6947e98ae6b4c3dc754dbf57b8073caa6b7f735a59bf2faab61f2fde29162
-  data.tar.gz: 52d1c943f40c811ad864a93981066d737e325f2cdd5576210aefa8e33102a2ed13f057451fba42f177ed0752119275909e038becbc436be01578dab1419a5567
+  metadata.gz: 27b1ae7e5f792cbdfe8efdd41fb45398a732460cda2ecb7f7c3d43e03d275a0e40b88d6534d9388badd4d363cda5f9ddb75fb98f861cfda19ae6144d3945e104
+  data.tar.gz: 0e4a32e06c0e4127fa7f1d5177b7ba5326e3fc486ad5f701c257e26122a22e66e52cbe54a41aed4e4b4316743f53e67e7be6d3d8030da4692a35b0efbcc9c1a8

data/app/models/enju_biblio/ability.rb

@@ -6,15 +6,15 @@ module EnjuBiblio
       case user.try(:role).try(:name)
       when 'Administrator'
         can [:read, :create, :update], CarrierType
-        can :destroy, CarrierType do |carrier_type|
+        can [:destroy, :delete], CarrierType do |carrier_type|
           true unless carrier_type.manifestations.exists?
         end if LibraryGroup.site_config.network_access_allowed?(ip_address)
         can [:read, :create, :update], Item
-        can :destroy, Item do |item|
+        can [:destroy, :delete], Item do |item|
           item.deletable?
         end
         can [:read, :create, :update], Manifestation
-        can :destroy, Manifestation do |manifestation|
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master?
         end
         can :manage, [
@@ -41,7 +41,6 @@ module EnjuBiblio
           SeriesHasManifestation
         ]
         can :update, [
-          CarrierType,
           ContentType,
           Country,
           Extent,
@@ -72,15 +71,16 @@ module EnjuBiblio
         ]
       when 'Librarian'
         can :manage, Item
-        can [:read, :create, :update], Manifestation
-        can :destroy, Manifestation do |manifestation|
+        can :index, Manifestation
+        can [:show, :create, :update], Manifestation
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master?
         end
         can [:index, :create], Patron
         can :show, Patron do |patron|
           patron.required_role_id <= 3
         end
-        can [:update, :destroy], Patron do |patron|
+        can [:update, :destroy, :delete], Patron do |patron|
           !patron.user.try(:has_role?, 'Librarian') and patron.required_role_id <= 3
         end
         can :manage, [
@@ -123,7 +123,8 @@ module EnjuBiblio
         can :show, Item do |item|
           item.required_role_id <= 2
         end
-        can [:read, :edit], Manifestation do |manifestation|
+        can :index, Manifestation
+        can [:show, :edit], Manifestation do |manifestation|
           manifestation.required_role_id <= 2
         end
         can :index, Patron
@@ -168,6 +169,10 @@ module EnjuBiblio
           SeriesHasManifestation
         ]
       else
+        can :index, Manifestation
+        can :show, Manifestation do |manifestation|
+          manifestation.required_role_id == 1
+        end
         can :index, Patron
         can :show, Patron do |patron|
           patron.required_role_id == 1 #name == 'Guest'
@@ -184,7 +189,6 @@ module EnjuBiblio
           Item,
           Language,
           License,
-          Manifestation,
           ManifestationRelationship,
           ManifestationRelationshipType,
           MediumOfPerformance,

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

@@ -14,7 +14,7 @@
 <%- @carrier_types.each do |carrier_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :destroy, carrier_type -%>
+      <%- if can? :delete, carrier_type -%>
         <%= move_position(carrier_type) -%>
       <%- end -%>
     </td>
@@ -25,7 +25,7 @@
       <%- if can? :update, carrier_type -%>
         <%= link_to t('page.edit'), edit_carrier_type_path(carrier_type) -%>
       <% end %>
-      <%- if can? :destroy, carrier_type -%>
+      <%- if can? :delete, carrier_type -%>
         <%= link_to t('page.destroy'), carrier_type_path(carrier_type), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, content_type -%>
         <%= link_to t('page.edit'), edit_content_type_path(content_type) -%>
       <% end %>
-      <%- if can? :destroy, content_type -%>
+      <%- if can? :delete, content_type -%>
         <%= link_to t('page.destroy'), content_type_path(content_type), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, create_type -%>
         <%= link_to t('page.edit'), edit_create_type_path(create_type) -%>
       <% end %>
-      <%- if can? :destroy, create_type -%>
+      <%- if can? :delete, create_type -%>
         <%= link_to t('page.destroy'), create_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>

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

@@ -14,7 +14,7 @@
     <td><%= link_to create.patron.full_name, create.patron -%></td>
     <td><%= link_to create.work.original_title, create.work -%></td>
     <td>
-      <%- if can? :destroy, create -%>
+      <%- if can? :delete, create -%>
         <%= link_to t('page.show'), create -%>
         <%= link_to t('page.destroy'), create, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

data/app/views/creates/_index_patron.html.erb

@@ -17,7 +17,7 @@
 <%- @creates.each do |create| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :destroy, create -%>
+      <%- if can? :delete, create -%>
         <%= create.first? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), {:action => 'update', :move => 'higher', :id => create.id, :patron_id => patron.id}, :method => :put) -%>
         <%= create.last? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), {:action => 'update', :move => 'lower', :id => create.id, :patron_id => patron.id}, :method => :put) -%>
       <%- end -%>
@@ -26,7 +26,7 @@
     <td><%= l(create.created_at) -%></td>
     <td><%= l(create.updated_at) -%></td>
     <td>
-      <%- if can? :destroy, create -%>
+      <%- if can? :delete, create -%>
         <%= link_to t('page.show'), patron_create_path(patron, create) -%>
         <%= link_to t('page.destroy'), patron_create_path(patron, create), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

data/app/views/creates/_index_work.html.erb

@@ -16,7 +16,7 @@
 <%- @creates.each do |create| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :destroy, create -%>
+      <%- if can? :delete, create -%>
         <%= create.first? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), work_create_path(create.work, create, :move => 'higher'), :method => :put) -%>
         <%= create.last? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), work_create_path(create.work, create, :move => 'lower'), :method => :put) -%>
       <%- end-%>

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

@@ -22,7 +22,7 @@
     </td>
     <td><%= link_to t('page.show'), donate -%></td>
     <td>
-      <%- if can? :destroy, donate -%>
+      <%- if can? :delete, donate -%>
         <%= link_to t('page.edit'), edit_donate_path(donate) -%>
         <%= link_to t('page.destroy'), donate, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

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

@@ -15,7 +15,7 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to exemplify.manifestation.original_title, exemplify.manifestation -%></td>
     <td><%= link_to exemplify.item.item_identifier, exemplify.item -%></td>
-    <%- if can? :destroy, exemplify -%>
+    <%- if can? :delete, exemplify -%>
       <td>
         <%= link_to t('page.show'), exemplify -%>
         <%= link_to t('page.destroy'), exemplify, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>

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

@@ -28,7 +28,7 @@
       <%- if can? :update, extent -%>
         <%= link_to t('page.edit'), edit_extent_path(extent) -%>
       <% end %>
-      <%- if can? :destroy, extent -%>
+      <%- if can? :delete, extent -%>
         <%= link_to t('page.destroy'), extent, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, form_of_work -%>
         <%= link_to t('page.edit'), edit_form_of_work_path(form_of_work) -%>
       <% end %>
-      <%- if can? :destroy, form_of_work -%>
+      <%- if can? :delete, form_of_work -%>
         <%= link_to t('page.destroy'), form_of_work, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -23,7 +23,7 @@
       <%- if can? :update, frequency -%>
         <%= link_to t('page.edit'), edit_frequency_path(frequency) -%>
       <% end %>
-      <%- if can? :destroy, frequency -%>
+      <%- if can? :delete, frequency -%>
         <%= link_to t('page.destroy'), frequency, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -22,7 +22,7 @@
     <td><%= localized_state(import_request.state) -%></td>
     <td><%= link_to import_request.manifestation.original_title, import_request.manifestation if import_request.manifestation -%></td>
     <td>
-      <%- if can? :destroy, import_request -%>
+      <%- if can? :delete, import_request -%>
         <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), import_request, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -10,7 +10,7 @@
   <%= render 'manifestations/book_jacket', :manifestation => @item.manifestation -%>
   <ul>
     <li><%= link_to t('page.show'), @item -%></li>
-    <% if can? :destroy, @item %>
+    <% if can? :delete, @item %>
       <li><%= link_to t('page.destroy'), @item, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <% end %>
     <li><%= link_to t('page.back'), manifestation_items_path(@item.manifestation) -%></li>

data/app/views/items/index.mobile.erb

@@ -41,7 +41,7 @@
       <td><%= link_to item.shelf.library.display_name.localize, item.shelf.library -%></td>
       <td><%= link_to item.shelf_display_name.localize, item.shelf -%></td>
       <td><%= item.circulation_status.display_name.localize -%></td>
-      <%- if can? :destroy, item -%>
+      <%- if can? :delete, item -%>
         <td><%= link_to t('page.edit'), edit_item_path(item) -%></td>
       <%- end -%>
   </tr>

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

@@ -141,7 +141,7 @@
     <% if defined?(EnjuInterLibraryLoan) %>
       <li><%= link_to t('page.listing', :model => t('activerecord.models.inter_library_loan')), item_inter_library_loans_path(@item) -%></li>
     <% end %>
-    <% if can? :destroy, @item %>
+    <% if can? :delete, @item %>
       <li><%= link_to t('page.destroy'), @item, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <% end %>
     <% if defined?(EnjuInterLibraryLoan) %>

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

@@ -27,7 +27,7 @@
       <%- if can? :update, license -%>
         <%= link_to t('page.edit'), edit_license_path(license) -%>
       <% end %>
-      <%- if can? :destroy, license -%>
+      <%- if can? :delete, license -%>
         <%= link_to t('page.destroy'), license, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, manifestation_relationship_type -%>
         <%= link_to t('page.edit'), edit_manifestation_relationship_type_path(manifestation_relationship_type) -%>
       <% end %>
-      <%- if can? :destroy, manifestation_relationship_type -%>
+      <%- if can? :delete, manifestation_relationship_type -%>
         <%= link_to t('page.destroy'), manifestation_relationship_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>

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

@@ -9,7 +9,7 @@
   <%= render 'manifestations/book_jacket', :manifestation => @manifestation -%>
   <ul>
     <li><%= link_to t('page.show'), @manifestation -%></li>
-    <% if can? :destroy, @manifestation %>
+    <% if can? :delete, @manifestation %>
       <li><%= link_to t('page.destroy'), @manifestation, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <% end %>
     <%- case when @patron -%>

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

@@ -91,7 +91,7 @@
               <%- end -%>
             </ul>
           </li>
-          <% if can? :destroy, @manifestation %>
+          <% if can? :delete, @manifestation %>
             <li><%= link_to t('page.destroy'), @manifestation, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
           <% end %>
           <li><%= link_to t('manifestation.add_derivation'), manifestation_manifestations_path(@manifestation, :mode => 'add') -%></li>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, medium_of_performance -%>
         <%= link_to t('page.edit'), edit_medium_of_performance_path(medium_of_performance) -%>
       <% end %>
-      <%- if can? :destroy, medium_of_performance -%>
+      <%- if can? :delete, medium_of_performance -%>
         <%= link_to t('page.destroy'), medium_of_performance, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -24,7 +24,7 @@
       <%= render 'manifestations/show_index', :manifestation => own.item.manifestation -%>
     </td>
     <td>
-      <%- if can? :destroy, own -%>
+      <%- if can? :delete, own -%>
         <%= link_to t('page.show'), own -%>
         <%= link_to t('page.destroy'), own, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, patron_relationship_type -%>
         <%= link_to t('page.edit'), edit_patron_relationship_type_path(patron_relationship_type) -%>
       <% end %>
-      <%- if can? :destroy, patron_relationship_type -%>
+      <%- if can? :delete, patron_relationship_type -%>
         <%= link_to t('page.destroy'), patron_relationship_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, patron_type -%>
         <%= link_to t('page.edit'), edit_patron_type_path(patron_type) -%>
       <% end %>
-      <%- if can? :destroy, patron_type -%>
+      <%- if can? :delete, patron_type -%>
         <%= link_to t('page.destroy'), patron_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

data/app/views/patrons/_index_expression.html.erb

@@ -33,7 +33,7 @@
       <td><%= expression.realized(patron).realize_type.display_name.localize if params[:mode] != 'add' and expression.realized(patron).try(:realize_type) -%></td>
       <td><%= patron.patron_type.display_name.localize -%></td>
       <td>
-        <%- if can? :destroy, patron -%>
+        <%- if can? :delete, patron -%>
           <%- if params[:mode] == 'add' -%>
             <%= link_to t('page.add'), new_expression_realize_path(expression, :patron_id => patron.id) unless expression.contributors.include?(patron) -%>
           <%- else -%>

data/app/views/patrons/_index_manifestation.html.erb

@@ -29,7 +29,7 @@
       <td><%= manifestation.produced(patron).produce_type.display_name.localize if params[:mode] != 'add' and manifestation.produced(patron).try(:produce_type) -%></td>
       <td><%= patron.patron_type.display_name.localize -%></td>
       <td>
-        <%- if can? :destroy, patron -%>
+        <%- if can? :delete, patron -%>
           <%- if params[:mode] == 'add' -%>
             <%= link_to t('page.add'), new_manifestation_produce_path(manifestation, :patron_id => patron.id) unless manifestation.publishers.include?(patron) -%>
           <%- else -%>

data/app/views/patrons/_index_patron.html.erb

@@ -39,12 +39,12 @@
       <td><%= patron.patron_type.display_name.localize -%></td>
       <td><%=l patron.date_of_birth if patron.date_of_birth -%></td>
       <td>
-        <%- if can? :destroy, patron -%>
+        <%- if can? :delete, patron -%>
           <%= link_to t('page.edit'), edit_patron_path(patron) -%>
         <% end %>
       </td>
       <td>
-        <%- if can? :destroy, patron -%>
+        <%- if can? :delete, patron -%>
           <%- if params[:mode] == "add" -%>
             <%= link_to t('page.add'), new_patron_patron_relationship_path(patron, :child_id => patron.id) unless patron.derived_patrons.include?(patron) or patron == patron -%>
           <%- else -%>

data/app/views/patrons/_index_patron_merge_list.html.erb

@@ -29,7 +29,7 @@
     <td><%= patron.patron_type.display_name.localize -%></td>
     <td><%=l patron.date_of_birth if patron.date_of_birth -%></td>
     <td>
-      <%- if can? :destroy, patron -%>
+      <%- if can? :delete, patron -%>
         <%- if params[:mode] == 'add' -%>
           <%= link_to t('page.add'), new_patron_merge_list_patron_merge_path(@patron_merge_list, :patron_id => patron.id) unless @patron_merge_list.patrons.include?(patron) -%>
         <%- else -%>

data/app/views/patrons/_index_work.html.erb

@@ -37,7 +37,7 @@
       <td><%= work.created(patron).create_type.display_name.localize if params[:mode] != 'add' and work.created(patron).try(:create_type) -%></td>
       <td><%= patron.patron_type.display_name.localize -%></td>
       <td>
-        <%- if can? :destroy, patron -%>
+        <%- if can? :delete, patron -%>
           <%- if params[:mode] == 'add' -%>
             <%= link_to t('page.add'), new_work_create_path(work, :patron_id => patron.id) unless work.creators.include?(patron) -%>
           <%- else -%>

data/app/views/patrons/_patron.html.erb

@@ -5,7 +5,7 @@
       </td>
       <td><%= patron.patron_type.display_name.localize -%></td>
       <td>
-        <%- if can? :destroy, patron -%>
+        <%- if can? :delete, patron -%>
           <%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_patron_path(patron) -%>
           <%= link_to image_tag('icons/arrow_divide.png', :size => '16x16', :alt => t('patron.add_derivation')), patron_patrons_path(patron, :mode => 'add') -%>
         <%- end -%>

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

@@ -8,7 +8,7 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <li><%= link_to t('page.show'), @patron -%></li>
-    <%- if can? :destroy, @patron -%>
+    <%- if can? :delete, @patron -%>
       <li><%= link_to t('page.destroy'), @patron, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <%- end -%>
     <li><%= link_to t('page.back'), patrons_path -%></li>

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

@@ -78,7 +78,7 @@
         <td><strong><%= t('activerecord.models.language') -%>:</strong></td>
         <td><%= @patron.language.display_name.localize -%></td>
       </tr>
-      <%- if can? :destroy, @patron -%>
+      <%- if can? :delete, @patron -%>
         <tr>
           <td><strong><%= t('activerecord.attributes.patron.zip_code_1') -%>:</strong></td>
           <td><%= @patron.zip_code_1 -%></td>
@@ -191,7 +191,7 @@
       <li><%= link_to t('page.edit'), edit_patron_path(@patron) -%></li>
       <li><%= link_to t('patron.add_derivation'), patron_patrons_path(@patron, :mode => 'add') -%></li>
     <%- end -%>
-    <%- if can? :destroy, @patron -%>
+    <%- if can? :delete, @patron -%>
       <li><%= link_to t('page.new', :model => t('activerecord.models.patron')), new_patron_path -%></li>
       <li><%= link_to t('page.destroy'), @patron, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <%- end -%>

data/app/views/patrons/show.mobile.erb

@@ -52,7 +52,7 @@
         <td><strong><%= t('activerecord.models.language') -%>:</strong></td>
         <td><%= @patron.language.display_name.localize -%></td>
       </tr>
-      <%- if can? :destroy, @patron -%>
+      <%- if can? :delete, @patron -%>
         <tr>
           <td><strong><%= t('activerecord.attributes.patron.zip_code_1') -%>:</strong></td>
           <td><%= @patron.zip_code_1 -%></td>

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

@@ -26,7 +26,7 @@
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :destroy, picture_file -%>
+        <%- if can? :delete, picture_file -%>
           <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
         <%- end -%>
       </td>

data/app/views/picture_files/_index_event.html.erb

@@ -31,7 +31,7 @@
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :destroy, picture_file -%>
+        <%- if can? :delete, picture_file -%>
           <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
         <%- end -%>
       </td>

data/app/views/picture_files/_index_manifestation.html.erb

@@ -33,7 +33,7 @@
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :destroy, picture_file -%>
+        <%- if can? :delete, picture_file -%>
           <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
         <%- end -%>
       </td>

data/app/views/picture_files/_index_patron.html.erb

@@ -33,7 +33,7 @@
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :destroy, picture_file -%>
+        <%- if can? :delete, picture_file -%>
           <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
         <%- end -%>
       </td>

data/app/views/picture_files/_index_shelf.html.erb

@@ -31,7 +31,7 @@
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :destroy, picture_file -%>
+        <%- if can? :delete, picture_file -%>
           <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
         <%- end -%>
       </td>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, produce_type -%>
         <%= link_to t('page.edit'), edit_produce_type_path(produce_type) -%>
       <% end %>
-      <%- if can? :destroy, produce_type -%>
+      <%- if can? :delete, produce_type -%>
         <%= link_to t('page.destroy'), produce_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>

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

@@ -14,7 +14,7 @@
     <td><%= link_to produce.patron.full_name, produce.patron -%></td>
     <td><%= link_to produce.manifestation_original_title, produce.manifestation -%></td>
     <td>
-      <%- if can? :destroy, produce -%>
+      <%- if can? :delete, produce -%>
         <%= link_to t('page.show'), produce -%>
         <%= link_to t('page.destroy'), produce, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

data/app/views/produces/_index_manifestation.html.erb

@@ -16,7 +16,7 @@
 <%- @produces.each do |produce| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :destroy, produce -%>
+      <%- if can? :delete, produce -%>
         <%= produce.first? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), manifestation_produce_path(produce.manifestation, produce, :move => 'higher'), :method => :put) -%>
         <%= produce.last? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), manifestation_produce_path(produce.manifestation, produce, :move => 'lower'), :method => :put) -%>
       <%- end -%>

data/app/views/produces/_index_patron.html.erb

@@ -18,7 +18,7 @@
     <td><%= l(produce.created_at) -%></td>
     <td><%= l(produce.updated_at) -%></td>
     <td>
-      <%- if can? :destroy, produce -%>
+      <%- if can? :delete, produce -%>
         <%= link_to t('page.destroy'), patron_produce_path(patron, produce), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -25,7 +25,7 @@
       <%- if can? :update, realize_type -%>
         <%= link_to t('page.edit'), edit_realize_type_path(realize_type) -%>
       <% end %>
-      <%- if can? :destroy, realize_type -%>
+      <%- if can? :delete, realize_type -%>
         <%= link_to t('page.destroy'), realize_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>

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

@@ -14,7 +14,7 @@
     <td><%= link_to realize.patron.full_name, realize.patron -%></td>
     <td><%= link_to realize.expression.original_title, realize.expression -%></td>
     <td>
-      <%- if can? :destroy, realize -%>
+      <%- if can? :delete, realize -%>
         <%= link_to t('page.show'), realize -%>
         <%= link_to t('page.destroy'), realize, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

data/app/views/realizes/_index_expression.html.erb

@@ -16,7 +16,7 @@
 <%- @realizes.each do |realize| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :destroy, realize -%>
+      <%- if can? :delete, realize -%>
         <%= realize.first? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), expression_realize_path(realize.expression, realize, :move => 'higher'), :method => :put) -%>
         <%= realize.last? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), expression_realize_path(realize.expression, realize, :move => 'lower'), :method => :put) -%>
       <%- end -%>

data/app/views/realizes/_index_patron.html.erb

@@ -18,7 +18,7 @@
     <td><%= l(realize.created_at) -%></td>
     <td><%= l(realize.updated_at) -%></td>
     <td>
-      <%- if can? :destroy, realize -%>
+      <%- if can? :delete, realize -%>
         <%= link_to t('page.destroy'), patron_realize_path(patron, realize), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -51,7 +51,7 @@
     </td>
     <td>
       <%= link_to t('page.edit'), edit_series_statement_path(series_statement) if can? :update, series_statement -%>
-      <%= link_to t('page.destroy'), series_statement, :data => {:confirm => t('page.are_you_sure')}, :method => :delete if can? :destroy, series_statement -%>
+      <%= link_to t('page.destroy'), series_statement, :data => {:confirm => t('page.are_you_sure')}, :method => :delete if can? :delete, series_statement -%>
     </td>
   </tr>
 <% end %>

data/app/views/series_statements/_index_series_statement_merge_list.html.erb

@@ -29,7 +29,7 @@
     <td><%= series_statement.issn -%></td>
     <td><%= series_statement.series_statement_identifier -%></td>
     <td>
-      <%- if can? :destroy, series_statement -%>
+      <%- if can? :delete, series_statement -%>
         <%- if params[:mode] == 'add' -%>
           <%= link_to t('page.add'), new_series_statement_merge_list_series_statement_merge_path(@series_statement_merge_list, :series_statement_id => series_statement.id) unless @series_statement_merge_list.series_statements.include?(series_statement) -%>
         <%- else -%>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre23"
+  VERSION = "0.1.0.pre24"
 end

data/spec/dummy/app/models/ability.rb

@@ -6,15 +6,15 @@
       case user.try(:role).try(:name)
       when 'Administrator'
         can [:read, :create, :update], CarrierType
-        can :destroy, CarrierType do |carrier_type|
+        can [:destroy, :delete], CarrierType do |carrier_type|
           true unless carrier_type.manifestations.exists?
         end if LibraryGroup.site_config.network_access_allowed?(ip_address)
         can [:read, :create, :update], Item
-        can :destroy, Item do |item|
+        can [:destroy, :delete], Item do |item|
           item.deletable?
         end
         can [:read, :create, :update], Manifestation
-        can :destroy, Manifestation do |manifestation|
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master?
         end
         can :manage, [
@@ -71,15 +71,16 @@
         ]
       when 'Librarian'
         can :manage, Item
-        can [:read, :create, :update], Manifestation
-        can :destroy, Manifestation do |manifestation|
+        can :index, Manifestation
+        can [:show, :create, :update], Manifestation
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master?
         end
         can [:index, :create], Patron
         can :show, Patron do |patron|
           patron.required_role_id <= 3
         end
-        can [:update, :destroy], Patron do |patron|
+        can [:update, :destroy, :delete], Patron do |patron|
           !patron.user.try(:has_role?, 'Librarian') and patron.required_role_id <= 3
         end
         can :manage, [
@@ -122,7 +123,8 @@
         can :show, Item do |item|
           item.required_role_id <= 2
         end
-        can [:read, :edit], Manifestation do |manifestation|
+        can :index, Manifestation
+        can [:show, :edit], Manifestation do |manifestation|
           manifestation.required_role_id <= 2
         end
         can :index, Patron
@@ -167,6 +169,10 @@
           SeriesHasManifestation
         ]
       else
+        can :index, Manifestation
+        can :show, Manifestation do |manifestation|
+          manifestation.required_role_id == 1
+        end
         can :index, Patron
         can :show, Patron do |patron|
           patron.required_role_id == 1 #name == 'Guest'
@@ -183,7 +189,6 @@
           Item,
           Language,
           License,
-          Manifestation,
           ManifestationRelationship,
           ManifestationRelationshipType,
           MediumOfPerformance,

data/spec/dummy/solr/data/test/index/_2fh.fnm

@@ -0,0 +1,7 @@
+����+idtype
+class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
+library_sm
+language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
+end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
+creator_smsort_title_speriodical_bperiodical_master_breservable_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dm

data/spec/dummy/solr/data/test/index/_2fh.nrm

@@ -0,0 +1 @@
+NRM�turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttptxy|||||||||||tuuu|||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||u|||||||||||||||||uvw|||||||x|||||||||||||||||||||||||||||||||||||||y||||||||||||w���|||||||||||||||||||||||||||||||||��|||||||||||w���|||||||||||||||||||||||||||||||||xy|||||||||||tuuu|||||||||||||||||||||||||||||||||turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttpt||||��|||||��||||||||||||||||||||||||||||||||||||||tu|||||||||||||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/_2fi.fnm

@@ -0,0 +1,7 @@
+����+idtype
+class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
+library_sm
+language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
+end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
+creator_smsort_title_speriodical_bperiodical_master_breservable_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dm

data/spec/dummy/solr/data/test/index/_2fi.nrm

@@ -0,0 +1 @@
+NRM�xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/_2fj.fnm

@@ -0,0 +1,8 @@
+����3idtype
+class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
+library_sm
+language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
+end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
+creator_smsort_title_speriodical_bperiodical_master_breservable_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dmissn_sm	issn_text
volume_number_iissue_number_iserial_number_iatitle_text
date_of_publication_d
+pub_year_i

data/spec/dummy/solr/data/test/index/_2fj.nrm

@@ -0,0 +1 @@
+NRM�vruwvvuur|xutttttwwuuuuuuxx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xtt|uuutt||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||vruwvvuur|xu||tttwwuuuuuuxx|||||y|||��|||||||���������||||||||||||xw|||||||||||||||||||||||||y||||||||||||||||||||||||||tt|||||||||||||

data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1363198258.055524:@value"
+i


metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre23
+  version: 0.1.0.pre24
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre13
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
@@ -422,14 +422,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre14
+        version: 0.1.0.pre15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre14
+        version: 0.1.0.pre15
 - !ruby/object:Gem::Dependency
   name: enju_oai
   requirement: !ruby/object:Gem::Requirement
@@ -1142,12 +1142,37 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_2fh.fdt
+- spec/dummy/solr/data/test/index/_2fh.fdx
+- spec/dummy/solr/data/test/index/_2fh.fnm
+- spec/dummy/solr/data/test/index/_2fh.frq
+- spec/dummy/solr/data/test/index/_2fh.nrm
+- spec/dummy/solr/data/test/index/_2fh.prx
+- spec/dummy/solr/data/test/index/_2fh.tii
+- spec/dummy/solr/data/test/index/_2fh.tis
+- spec/dummy/solr/data/test/index/_2fi.fdt
+- spec/dummy/solr/data/test/index/_2fi.fdx
+- spec/dummy/solr/data/test/index/_2fi.fnm
+- spec/dummy/solr/data/test/index/_2fi.frq
+- spec/dummy/solr/data/test/index/_2fi.nrm
+- spec/dummy/solr/data/test/index/_2fi.prx
+- spec/dummy/solr/data/test/index/_2fi.tii
+- spec/dummy/solr/data/test/index/_2fi.tis
+- spec/dummy/solr/data/test/index/_2fj.fdt
+- spec/dummy/solr/data/test/index/_2fj.fdx
+- spec/dummy/solr/data/test/index/_2fj.fnm
+- spec/dummy/solr/data/test/index/_2fj.frq
+- spec/dummy/solr/data/test/index/_2fj.nrm
+- spec/dummy/solr/data/test/index/_2fj.prx
+- spec/dummy/solr/data/test/index/_2fj.tii
+- spec/dummy/solr/data/test/index/_2fj.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_36o
+- spec/dummy/solr/data/test/index/segments_3hm
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
+- spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/content_type.rb
@@ -1575,12 +1600,37 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_2fh.fdt
+- spec/dummy/solr/data/test/index/_2fh.fdx
+- spec/dummy/solr/data/test/index/_2fh.fnm
+- spec/dummy/solr/data/test/index/_2fh.frq
+- spec/dummy/solr/data/test/index/_2fh.nrm
+- spec/dummy/solr/data/test/index/_2fh.prx
+- spec/dummy/solr/data/test/index/_2fh.tii
+- spec/dummy/solr/data/test/index/_2fh.tis
+- spec/dummy/solr/data/test/index/_2fi.fdt
+- spec/dummy/solr/data/test/index/_2fi.fdx
+- spec/dummy/solr/data/test/index/_2fi.fnm
+- spec/dummy/solr/data/test/index/_2fi.frq
+- spec/dummy/solr/data/test/index/_2fi.nrm
+- spec/dummy/solr/data/test/index/_2fi.prx
+- spec/dummy/solr/data/test/index/_2fi.tii
+- spec/dummy/solr/data/test/index/_2fi.tis
+- spec/dummy/solr/data/test/index/_2fj.fdt
+- spec/dummy/solr/data/test/index/_2fj.fdx
+- spec/dummy/solr/data/test/index/_2fj.fnm
+- spec/dummy/solr/data/test/index/_2fj.frq
+- spec/dummy/solr/data/test/index/_2fj.nrm
+- spec/dummy/solr/data/test/index/_2fj.prx
+- spec/dummy/solr/data/test/index/_2fj.tii
+- spec/dummy/solr/data/test/index/_2fj.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_36o
+- spec/dummy/solr/data/test/index/segments_3hm
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
+- spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/content_type.rb