enju_library 0.1.0.pre32 → 0.1.0.pre33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce7e59f51105f6e420f742a76554c87a9226e0bc
-  data.tar.gz: fb02affb8c528890b19dffd7893b2c3d0dac91ab
+  metadata.gz: bd5f2a84f8de884044cc92ccf75b5b256eb4f9a1
+  data.tar.gz: 1fa77d84c76d38bedd20edb2cc23b9c7273006a4
 SHA512:
-  metadata.gz: d961f040adf10468b53dc933570743625f8540d888175feee5d649433403925a3f5a70e281bdc5fed6894b66d948d888cfd9c3243729b8dc0e6c81e8bcd71f0c
-  data.tar.gz: 51e31edc5d3f8746a0e6398a2bb70feb3ada3084e506721bf67f0f26d689259de47a6c625181c9169df6f6cd1c9b004b954c78a181283bca6c7befecddb94022
+  metadata.gz: 4547dfa9384a1876c44ac8121e6c96e3d85d2da70105d55c1587ecbad4773d248ed398c1bf1443ca32e3a927886e6faabc1815a5b9ffca0a18577c602d794e73
+  data.tar.gz: b4b6cdf0b15841f6831dc7d25324dcc9e49ed894bfeb87afeb4b221faa800c5f806b5ef8eaa8c6ef55ba1ec8fb9275258aaa30ece53b87f11800c193ffacddc1

data/app/models/accept.rb

@@ -10,6 +10,7 @@ class Accept < ActiveRecord::Base
   validates_presence_of :basket_id
 
   before_save :accept!, :on => :create
+  after_save :expire_manifestation_cache, if: Proc.new{|record| record.item.try(:manifestation).present?}
 
   attr_accessor :item_identifier
 
@@ -17,9 +18,15 @@ class Accept < ActiveRecord::Base
 
   def accept!
     if defined?(EnjuCirculation)
-      item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+      circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+      item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
+      use_restriction = UseRestriction.where(name: 'Limited Circulation, Normal Loan Period').first
+      item.use_restriction = use_restriction if use_restriction
     end
-    item.save(:validate => false)
+  end
+
+  def expire_manifestation_cache
+    ExpireFragmentCache.expire_fragment_cache(item.manifestation)
   end
 end
 

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @accept -%></li>
     <li><%= link_to t('page.back'), accepts_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
 
@@ -42,7 +42,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.accept')), new_accept_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
   <div id="accept_list">
@@ -7,7 +7,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), accepts_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -24,7 +24,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.basket')) -%></h1>
 <div id="content_list">
 
@@ -22,7 +22,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), basket_path(@basket) -%></li>
     <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.basket')) -%></h1>
 <div id="content_list">
 
@@ -24,7 +24,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.basket')), new_basket_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.basket')) -%></h1>
 <div id="content_list">
 
@@ -21,7 +21,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('activerecord.models.checkin'), new_checkin_path -%></li>
     <li><%= link_to t('page.search_resource', :model => t('activerecord.models.user')), users_path -%></li>

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

@@ -1,6 +1,6 @@
 <div id="content_list">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.basket')) -%></h1>
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <p id="notice"><%= notice %></p>
 
   <p>
@@ -15,7 +15,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_basket_path(@basket) -%></li>
     <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.bookstore')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @bookstore -%></li>
     <li><%= link_to t('page.back'), bookstores_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.bookstore')) -%></h1>
 <div id="content_list">
 
@@ -40,7 +40,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if can? :create, Bookstore -%>
     <ul>
       <li><%= link_to t('page.new', :model => t('activerecord.models.bookstore')), new_bookstore_path -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.bookstore')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), bookstores_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.bookstore')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -41,7 +41,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_bookstore_path(@bookstore) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.budget_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @budget_type -%></li>
     <li><%= link_to t('page.back'), budget_types_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.budget_type')) -%></h1>
 <div id="content_list">
 
@@ -36,7 +36,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.budget_type')), new_budget_type_path -%></li>
   </ul>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.budget_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), budget_types_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.budget_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_budget_type_path(@budget_type) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.library')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), library_path(@library) -%></li>
     <li><%= link_to t('page.back'), libraries_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.library')) -%></h1>
 <div id="content_list">
 
@@ -20,11 +20,15 @@
     <th id="position"></th>
     <th><%= t('activerecord.attributes.library.name') -%></th>
     <th>
-      <%= t('activerecord.attributes.library.telephone_number_1') -%>
+      <%= t('activerecord.attributes.library.display_name') -%>
       /
-      <%= t('activerecord.attributes.library.telephone_number_2') -%>
+      <%= t('activerecord.attributes.library.address') -%>
     </th>
     <th>
+      <%= t('activerecord.attributes.library.telephone_number_1') -%>
+      /
+      <%= t('activerecord.attributes.library.telephone_number_2') -%>
+      <br />
       <%= t('activerecord.attributes.library.fax_number') -%>
     </th>
     <th></th>
@@ -38,6 +42,7 @@
         <%= library.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 => library.name}, :method => :put) -%>
       <%- end -%>
     </td>
+    <td><%= link_to library.name, library -%></td>
     <td>
       <%= link_to library.display_name.localize, library -%>
       <br />
@@ -45,11 +50,14 @@
       <%= library.address -%>
     </td>
     <td>
-      <%= library.telephone_number_1 -%>
+      tel: <%= library.telephone_number_1 -%>
+      <% if library.telephone_number_2.present? %>
+      <br />
+        tel: <%= library.telephone_number_2 -%>
+      <% end %>
       <br />
-      <%= library.telephone_number_2 -%>
+      fax: <%= library.fax_number -%>
     </td>
-    <td><%= library.fax_number -%></td>
     <td>
       <%- if can? :update, library -%>
         <%= link_to t('page.edit'), edit_library_path(library) -%>
@@ -66,7 +74,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Library -%>
       <li><%= link_to t('page.new', :model => t('activerecord.models.library')), new_library_path -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.library')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), libraries_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= @library.display_name.localize -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -112,7 +112,7 @@
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
   <%- if can? :update, @library -%>
     <li><%= link_to t('page.edit'), edit_library_path(@library) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.library_group')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), library_groups_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.library_group')) -%></h1>
 <div id="content_list">
 
@@ -12,10 +12,12 @@
 
 <%- @library_groups.each do |library_group| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to h(library_group.display_name.localize), edit_library_group_path(library_group) -%></td>
+    <td><%= link_to h(library_group.display_name.localize), library_group -%></td>
     <td><%= library_group.name -%></td>
     <td><%= library_group.email -%></td>
-    <td><%= link_to t('page.edit'), edit_library_group_path(library_group) -%></td>
+    <td>
+      <%= link_to t('page.edit'), edit_library_group_path(library_group) if can?(:update, library_group) -%>
+    </td>
   </tr>
 <%- end -%>
 </table>
@@ -23,7 +25,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= t('library_group.configuration') -%></li>
   </ul>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.library_group')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), library_groups_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.library_group')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -63,7 +63,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_library_group_path(@library_group) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>