enju_circulation 0.1.0.pre11 → 0.1.0.pre12

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

@@ -0,0 +1,141 @@
+  <div id="tabs">
+    <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
+    <div id="detail">
+    <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_librarian_html', :role => current_user_role_name, :locale => @locale]) do %>
+      <table class="table table-striped" id="resource_detail">
+        <%= embed_content(manifestation) -%>
+        <% if manifestation.title_alternative? %>
+          <tr>
+            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
+            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
+          </tr>
+        <% end %>
+        <%- if manifestation.series_statement -%>
+          <tr>
+            <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
+            <td style="width: 500px">
+              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
+              <%= manifestation.volume_number_string %>
+              <%- if manifestation.issn.present? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- end -%>
+            </td>
+          </tr>
+        <% end %>
+        <%= render 'edition_and_number', :manifestation => manifestation %>
+        <tr>
+          <td style="width: 200px"><%= t('page.form') -%>:</td>
+          <td style="width: 500px">
+            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name.localize -%> /
+            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name.localize if manifestation.manifestation_content_type -%>
+          </td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.models.language') -%>:</td>
+          <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
+        </tr>
+        <tr>
+          <td><%= t('manifestation.physical_description') -%>:</td>
+          <td>
+            <%- if manifestation.number_of_pages -%>
+              <span itemprop="numPages"><%= manifestation.number_of_pages -%></span> p.
+              (<%= manifestation.start_page -%> - <%= manifestation.end_page -%>)
+            <%- end -%>
+            <!-- TODO: センチメートル以外の単位 -->
+            <%- if manifestation.height -%>
+              <%= manifestation.height -%> cm.
+            <%- end -%>
+          </td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.manifestation.price') -%>:</td>
+          <td><%= manifestation.price -%></td>
+        </tr>
+        <% if defined?(EnjuSubject) %>
+          <tr>
+            <td><%= t('activerecord.models.subject') -%>:</td>
+            <td>
+              <%- unless manifestation.subjects.empty? -%>
+                <ul>
+                  <%- manifestation.subjects.each do |subject| -%>
+                    <li>
+                      <%= link_to subject.term, subject -%>
+                      <%- unless subject.classifications.empty? -%>
+                        (
+                        <%- subject.classifications.each do |classification| -%>
+                          <%= classification.classification_type.name -%>: <%= link_to classification.category, classification -%>
+                        <%- end -%>
+                        )
+                      <%- end -%>
+                    </li>
+                  <%- end -%>
+                </ul>
+              <%- end -%>
+            </td>
+          </tr>
+          <tr>
+            <td><%= t('activerecord.attributes.classification.category') %></td>
+            <td>
+              <%= manifestation.ndc %>
+            </td>
+          </tr>
+        <% end %>
+        <% if defined?(EnjuBookmark) %>
+          <tr>
+            <td><%= t('activerecord.models.tag') -%>:</td>
+            <td>
+              <%= render 'manifestations/tag_list', :manifestation => manifestation -%>
+            </td>
+          </tr>
+        <% end %>
+        <%- unless manifestation.periodical? -%>
+          <tr>
+            <td><%= t('page.identifier') -%>:</td>
+            <td>
+              <%- if manifestation.isbn.present? -%>
+                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
+                <%- if manifestation.isbn10.present? -%>
+                  ( <%= manifestation.isbn10 -%> )
+                <%- end -%>
+              <%- end -%>
+              <%- if manifestation.nbn.present? -%>
+                NBN: <%= manifestation.nbn -%>
+              <%- end -%>
+              <%- if manifestation.lccn.present? -%>
+                <br />
+                LCCN: <%= manifestation.lccn -%>
+              <%- end -%>
+            </td>
+          </tr>
+        <%- end -%>
+        <%- unless manifestation.attachment_file_name.blank? -%>
+          <%= render 'manifestations/attachment_file', :manifestation => manifestation -%>
+        <%- end -%>
+        <tr>
+          <td><%= t('page.created_at') -%>:</td>
+          <td><%=l manifestation.created_at if manifestation.created_at -%></td>
+        </tr>
+        <tr>
+          <td><%= t('page.updated_at') -%>:</td>
+          <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>
+          <td>
+            <%= raw simple_format(h(manifestation.description)) -%>
+          </td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.manifestation.note') -%>:</td>
+          <td>
+            <%= raw simple_format(h(manifestation.note)) -%>
+          </td>
+        </tr>
+      </table>
+    <% end %>
+      <%- if manifestation.items.on_shelf.exists? -%>
+        <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
+      <%- end -%>
+    </div>
+    <%= render 'manifestations/tab_list', :manifestation => manifestation %>
+  </div>

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

@@ -0,0 +1,136 @@
+  <div id="tabs">
+    <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
+    <div id="detail">
+    <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_user_html', :role => current_user_role_name, :locale => @locale]) do %>
+      <table class="table table-striped" id="resource_detail">
+        <%= embed_content(manifestation) -%>
+        <% if manifestation.title_alternative? %>
+          <tr>
+            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
+            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
+          </tr>
+        <% end %>
+        <%- if manifestation.series_statement -%>
+          <tr>
+            <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
+            <td style="width: 500px">
+              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
+              <%= manifestation.volume_number_string %>
+              <%- if manifestation.issn.present? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- end -%>
+            </td>
+          </tr>
+        <% end %>
+        <%= render 'edition_and_number', :manifestation => manifestation %>
+        <tr>
+          <td style="width: 200px"><%= t('page.form') -%>:</td>
+          <td style="width: 500px">
+            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name.localize -%> /
+            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name.localize if manifestation.manifestation_content_type -%>
+          </td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.models.language') -%>:</td>
+          <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
+        </tr>
+        <tr>
+          <td><%= t('manifestation.physical_description') -%>:</td>
+          <td>
+            <%- if manifestation.number_of_pages -%>
+              <span itemprop="numPages"><%= manifestation.number_of_pages -%></span> p.
+              (<%= manifestation.start_page -%> - <%= manifestation.end_page -%>)
+            <%- end -%>
+            <!-- TODO: センチメートル以外の単位 -->
+            <%- if manifestation.height -%>
+              <%= manifestation.height -%> cm.
+            <%- end -%>
+          </td>
+        </tr>
+        <% if manifestation.price.present? %>
+          <tr>
+            <td><%= t('activerecord.attributes.manifestation.price') -%>:</td>
+            <td><%= manifestation.price -%></td>
+          </tr>
+        <% end %>
+        <% if defined?(EnjuSubject) %>
+          <%- unless manifestation.subjects.empty? -%>
+            <tr>
+              <td><%= t('activerecord.models.subject') -%>:</td>
+              <td>
+                <%- manifestation.subjects.each do |subject| -%>
+                  <%= link_to subject.term, subject -%>
+                <%- end -%>
+              </td>
+            </tr>
+          <%- end -%>
+          <tr>
+            <td><%= t('activerecord.attributes.classification.category') %></td>
+            <td>
+              <%= manifestation.ndc %>
+            </td>
+          </tr>
+        <% end %>
+        <% if defined?(EnjuBookmark) %>
+          <tr>
+            <td><%= t('activerecord.models.tag') -%>:</td>
+            <td>
+              <%= render 'manifestations/tag_list', :manifestation => manifestation -%>
+            </td>
+          </tr>
+        <% end %>
+        <%- unless manifestation.periodical? -%>
+          <tr>
+            <td><%= t('page.identifier') -%>:</td>
+            <td>
+              <%- if manifestation.isbn.present? -%>
+                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
+                <%- if manifestation.isbn10.present? -%>
+                  ( <%= manifestation.isbn10 -%> )
+                <%- end -%>
+              <%- end -%>
+              <%- if manifestation.nbn.present? -%>
+                NBN: <%= manifestation.nbn -%>
+              <%- end -%>
+              <%- if manifestation.lccn.present? -%>
+                <br />
+                LCCN: <%= manifestation.lccn -%>
+              <%- end -%>
+            </td>
+          </tr>
+        <%- end -%>
+        <%- unless manifestation.attachment_file_name.blank? -%>
+          <%= render 'manifestations/attachment_file', :manifestation => manifestation -%>
+        <%- end -%>
+        <tr>
+          <td><%= t('page.created_at') -%>:</td>
+          <td><%=l manifestation.created_at if manifestation.created_at -%></td>
+        </tr>
+        <tr>
+          <td><%= t('page.updated_at') -%>:</td>
+          <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
+        </tr>
+        <% if manifestation.description.present? %>
+          <tr>
+            <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>
+            <td>
+              <%= raw simple_format(h(manifestation.description)) -%>
+            </td>
+          </tr>
+        <% end %>
+        <% if manifestation.note.present? %>
+          <tr>
+            <td><%= t('activerecord.attributes.manifestation.note') -%>:</td>
+            <td>
+              <%= raw simple_format(h(manifestation.note)) -%>
+            </td>
+          </tr>
+        <% end %>
+      </table>
+    <% end %>
+      <%- if manifestation.items.on_shelf.exists? -%>
+        <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
+      <%- end -%>
+    </div>
+    <%= render 'manifestations/tab_list', :manifestation => manifestation %>
+  </div>

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

@@ -33,7 +33,7 @@
     <%= f.submit %>
   </div>
 <%- end -%>
-<%= javascript_tag("$('#reserve_user_number').focus().select();") -%>
+<%= javascript_tag("$(function(){$('#reserve_user_number').focus().select()})") %>
 </div>
 </div>
 

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

@@ -0,0 +1,15 @@
+<h4><%= t('activerecord.attributes.reserve.state') -%></h4>
+<%- unless @state_facet.blank? -%>
+  <ul>
+    <% @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)) %>
+        <% 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>
+    <%- end -%>
+  </ul>
+<%- end -%>

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

@@ -1,4 +1,5 @@
-    <strong><%= link_to title_with_volume_number(reserve.manifestation), reserve -%></strong>
+<strong><%= link_to title_with_volume_number(reserve.manifestation), reserve -%></strong>
+(<%= link_to t('reserve.bibliographic_detail'), reserve.manifestation %>)
     <br />
     <%- if reserve.manifestation.creators.readable_by(current_user).exists? -%>
       <%= t('patron.creator') -%>: <%= patrons_list(reserve.manifestation.creators.readable_by(current_user)) -%>

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

@@ -21,13 +21,31 @@
     (<%= @reserve.user.user_number %>)
   </div>
 
+  <% unless @reserve.completed? %>
+    <div class="field">
+      <%= f.label :item_identifier %><br />
+      <%= f.text_field :item_identifier %>
+    </div>
+  <% end %>
+
   <div class="field">
     <%= f.label :expired_at -%><br />
     <%= f.text_field :expired_at, :value => @reserve.expired_at.try(:strftime, "%Y-%m-%d"), :class => 'date_field', :placeholder => "#{t('page.example')}: 2011-04-12"-%>
   </div>
 
+  <% unless @reserve.errors[:base].empty? %>
+    <div class="field">
+      <%= f.label :force_retaining %><br />
+      <%= f.check_box :force_retaining %>
+    </div>
+  <% end %>
+
   <div class="actions">
-    <%= f.submit %>
+    <% if @reserve.retained? %>
+      <%= f.submit :confirm => "#{t('reserve.attempt_to_update_retained_reservation')} #{t('page.continue')}" %>
+    <% else %>
+      <%= f.submit %>
+    <% end %>
   </div>
 <%- end -%>
 
@@ -37,6 +55,6 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <li><%= link_to t('page.show'), @reserve -%></li>
-    <li><%= link_to t('page.back'), user_reserves_path(@reserve.user) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

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

@@ -1,4 +1,4 @@
-title,isbn,item_identifier,call_number,created_at
+manifestation_id,title,isbn,item_identifier,call_number,username,created_at,expired_at
 <%- @reserves.each do |reserve| -%>
-"<%=h reserve.manifestation.original_title.gsub(/"/, '""') -%>",<%=h reserve.manifestation.isbn %>,<%=h reserve.item.try(:item_identifier) -%>,<%=h reserve.item.try(:call_number) -%>,<%=h reserve.item.try(:created_at) %><%= "\n" -%>
+<%= manifestation.id %>,"<%= reserve.manifestation.original_title.gsub(/"/, '""') -%>",<%= reserve.manifestation.isbn %>,<%= reserve.item.try(:item_identifier) -%>,<%= reserve.item.try(:call_number) -%>,<%= reserve.user.try(:username) %>,<%= reserve.created_at %>,<%= reserve.expired_at %><%= "\n" -%>
 <%- end -%>

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

@@ -2,13 +2,25 @@
 <div id="content_detail" class="ui-corner-all">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.reserve')) -%></h1>
 <div id="content_list">
+
+<div class="search_form">
+<%= form_for :reserves, :url => reserves_path, :html => {:method => 'get'} do -%>
+  <p>
+    <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+    <br />
+    <%= t('activerecord.attributes.reserve.created_at') %>:
+    <%= t('reserve.reserved_from') %>: <%= text_field_tag 'reserved_from', @reserved_from, {:class => 'date_field', :placeholder => "#{t('page.example')}: 2012-04-12"} -%>
+    <%= t('reserve.reserved_to') %>: <%= text_field_tag 'reserved_to', @reserved_to, {:class => 'date_field', :placeholder => "#{t('page.example')}: 2012-05-11"} -%>
+    <%= submit_tag t('page.search') -%>
+  </p>
+<%- end -%>
+</div>
+
 <table class="table table-striped index">
   <tr>
-    <th style="width: 30px"><%= 'Id' -%></th>
-    <th><%= t('activerecord.models.user') -%></th>
+    <th style="width: 30px">ID</th>
     <th><%= t('activerecord.models.manifestation') -%></th>
     <th style="width: 80px"><%= t('activerecord.attributes.reserve.state') -%></th>
-    <th><%= t('activerecord.attributes.reserve.expired_at') -%></th>
     <%- if can? :update, @reserves.first -%>
       <th style="width: 70px"></th>
     <% end %>
@@ -17,12 +29,21 @@
 <%- @reserves.each_with_index do |reserve, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to reserve.id, reserve -%></td>
-    <td><%= link_to reserve.user.username, reserve.user -%></td>
     <td>
       <%= render 'title', :reserve => reserve -%>
+      <br />
+      <%= t('activerecord.models.user') -%>: <%= link_to reserve.user.username, reserve.user -%>
+      <%= t('activerecord.attributes.reserve.created_at') %>: <%= l(reserve.created_at, :format => :short) -%>
+      <br />
+      <%= t('activerecord.attributes.reserve.expired_at') %>: <%= l(reserve.expired_at, :format => :short) -%>
+    </td>
+    <td>
+      <%= i18n_state(reserve.state) -%>
+      <% if reserve.item %>
+        <br />
+        (<%= link_to reserve.item.item_identifier, reserve.item %>)
+      <% end %>
     </td>
-    <td><%= i18n_state(reserve.state) -%></td>
-    <td><%= l(reserve.expired_at, :format => :only_date) -%></td>
     <%- if can? :destroy, reserve -%>
       <td>
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>
@@ -59,6 +80,9 @@
       <li><%= link_to t('page.listing', :model => t('activerecord.models.checkout')), user_checkouts_path(@user) -%></li>
     <%- end -%>
   </ul>
+
+  <%= render 'state_facet' %>
+
   <p>
     <%- if @user -%>
       <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), user_reserves_path(@user, :format => :rss) -%>

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

@@ -21,23 +21,38 @@
   <%= i18n_state(@reserve.state) -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.item.item_identifier') -%>:</strong>
+  <%= link_to @reserve.item.item_identifier, @reserve.item if @reserve.item -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.reserve.created_at') -%>:</strong>
   <%= l(@reserve.created_at) -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.reserve.expired_at') -%>:</strong>
+  <%= l(@reserve.expired_at) if @reserve.expired_at -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.reserve.retained_at') -%>:</strong>
+  <%= l(@reserve.retained_at) if @reserve.retained_at -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.reserve.canceled_at') -%>:</strong>
   <%= l(@reserve.canceled_at) if @reserve.canceled_at -%>
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.reserve.expired_at') -%>:</strong>
-  <%= l(@reserve.expired_at, :format => :only_date) if @reserve.expired_at -%>
+  <strong><%= t('activerecord.attributes.reserve.postponed_at') -%>:</strong>
+  <%= l(@reserve.postponed_at) if @reserve.postponed_at -%>
 </p>
 
 <p>
-<strong><%= t('activerecord.attributes.reserve.checked_out_at') -%>:</strong>
+  <strong><%= t('activerecord.attributes.reserve.checked_out_at') -%>:</strong>
   <%= l(@reserve.checked_out_at) if @reserve.checked_out_at -%>
 </p>
 

data/config/locales/translation_en.yml

@@ -43,12 +43,15 @@ en:
         expired_at: Expired at
         deleted_at: Deleted at
         created_at: Reserved at
+        retained_at: Retained at
+        postponed_at: Postponed at
+        state: State
+        force_retaining: Force retaining
       checkout_type:
         name: Name
         display_name: Display name
         note: Note
         position: Position
-        state: State
       circulation_status:
         name: Name
         display_name: Display name
@@ -158,6 +161,7 @@ en:
     my_reservation: "My reservations"
     all_reservation: "All reservations"
     this_manifestation_is_already_reserved: "This manifestation is already reserved."
+    this_manifestation_is_already_checked_out: "This manifestation is already checked out."
     excessed_reservation_limit: "Excessed reservation limit."
     this_patron_cannot_reserve: "This patron can't reserve this manifestation."
     reservation_was_canceled: "Reservation was canceled."
@@ -170,6 +174,11 @@ en:
     retained: "Retained"
     canceled: "Canceled"
     expired: "Expired"
+    postponed: "Postponed"
     completed: "Completed"
+    reserved_from: "From"
+    reserved_to: "To"
+    attempt_to_update_retained_reservation: "You are attemping to update a retained reservation."
+    bibliographic_detail: "Bibliographic details"
   page:
     saving: "Saving..."

data/config/locales/translation_ja.yml

@@ -40,8 +40,11 @@ ja:
         canceled_at: 取消時刻
         expired_at: 有効期限（この日以降は不要）
         deleted_at: 削除時刻
-        created_at: 予約日時
+        created_at: 予約時刻
+        retained_at: 確保時刻
+        postponed_at: 取置取消時刻
         state: 状態
+        force_retaining: 強制的に取り置きを行う
       checkout_type:
         name: 名前
         display_name: 表示名
@@ -156,6 +159,7 @@ ja:
     my_reservation: "自分の予約"
     all_reservation: "全ての予約"
     this_manifestation_is_already_reserved: "この資料はすでに予約されています。"
+    this_manifestation_is_already_checked_out: "この資料はすでに貸し出されています。"
     excessed_reservation_limit: "予約できる資料数の上限を超えています。"
     this_patron_cannot_reserve: "この利用者はこの資料を予約できません。"
     reservation_was_canceled: "予約は取り消されました。"
@@ -168,6 +172,11 @@ ja:
     retained: "取置済み"
     canceled: "取消済み"
     expired: "期限切れ"
+    postponed: "取置延期"
     completed: "貸出済み"
+    reserved_from: "この日から"
+    reserved_to: "この日まで"
+    attempt_to_update_retained_reservation: "取り置き済みの予約を変更しようとしています。"
+    bibliographic_detail: "書誌詳細"
   page:
     saving: "保存中..."

data/db/migrate/20130303104849_add_state_index_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddStateIndexToReserve < ActiveRecord::Migration
+  def change
+    add_index :reserves, :state
+  end
+end

data/db/migrate/20130303124821_add_retained_at_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddRetainedAtToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :retained_at, :datetime
+  end
+end

data/db/migrate/20130304015019_add_postponed_at_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddPostponedAtToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :postponed_at, :datetime
+  end
+end

data/lib/enju_circulation/item.rb

@@ -135,6 +135,10 @@ module EnjuCirculation
           create_lending_policy
         end
       end
+
+      def next_reservation
+        Reserve.waiting.where(:item_id => id).first
+      end
     end
   end
 end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre11"
+  VERSION = "0.1.0.pre12"
 end

data/spec/controllers/checkins_controller_spec.rb

@@ -343,8 +343,8 @@ describe CheckinsController do
 
         it "should not update checkin without item_identifier" do
           put :update, :id => @checkin.id, :checkin => @attrs.merge(:item_identifier => nil)
-          assigns(:checkin).should_not be_valid
-          response.should be_success
+          assigns(:checkin).should be_valid
+          response.should redirect_to(@checkin)
         end
       end