enju_biblio 0.1.0.pre66 → 0.1.0.pre67

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

@@ -77,6 +77,12 @@
                     <%= identifier_link(identifier) %>
                   </li>
                 <% end %>
+                <% if manifestation.manifestation_identifier %>
+                  <li>
+                    <%= t('activerecord.attributes.manifestation.manifestation_identifier') %>:
+                    <%= manifestation.manifestation_identifier %>
+                  </li>
+                <% end %>
               </ul>
             </td>
           </tr>
@@ -106,9 +112,12 @@
         </tr>
       </table>
     <% end %>
-      <%- if manifestation.items.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
-      <%- end -%>
-    </div>
+    <%- if manifestation.items.on_shelf.exists? -%>
+      <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.on_shelf -%>
+    <%- end -%>
+    <%- if can? :create, Item -%>
+      <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 %>
+    </div>
   </div>

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

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

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

@@ -10,11 +10,6 @@
       <th><%= t('activerecord.models.circulation_status') -%></th>
     <% end %>
   </tr>
-  <% if current_user.try(:has_role?, 'Librarian') %>
-    <% items = manifestation.items %>
-  <% else %>
-    <% items = manifestation.items.for_checkout.on_shelf %>
-  <% end %>
   <%- items.each do |item| -%>
     <tr>
       <td>
@@ -68,9 +63,5 @@
     <% end %>
   <%- end -%>
 </table>
-
-<%- if can? :create, Item -%>
-  <p><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: manifestation.id) -%></p>
-<%- end -%>
 </div>
 <% end %>

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

@@ -0,0 +1 @@
+(<%= link_to "#", { onclick: "$('#holding_#{manifestation.id}').toggle(); return false;"} do t('page.holding') end %>)

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

@@ -34,7 +34,7 @@
   </script>
   <%- if user_signed_in? -%>
     <div id="call_number_content">
-      <%- @manifestation.items.for_checkout.on_shelf.each do |item| -%>
+      <%- @manifestation.items.on_shelf.each do |item| -%>
         <%- if item.hold?(current_user.profile.library) -%>
           <%= call_number_label(item) -%>
         <%- end -%>

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

@@ -0,0 +1,2 @@
+$("#holding_link_<%= @manifestation.id %>").html("<%= escape_javascript(render("show_holding_toggle", manifestation: @manifestation)) %>");
+$("#holding_<%= @manifestation.id %>").html("<%= escape_javascript(render("show_holding", manifestation: @manifestation, items: @manifestation.items.available_for(current_user))) %>");

data/app/views/notifier/manifestation_info.en.text.erb

@@ -7,7 +7,7 @@ Publisher(s): <%= @manifestation.publishers.readable_by(@user).collect(&:full_na
 ISBN: <%= @manifestation.identifier_contents(:isbn).join(" ") %>
 URL: <%= @manifestation.access_address %>
 Holding:
-<% @manifestation.items.for_checkout.on_shelf.each do |item| -%>
+<% @manifestation.items.on_shelf.each do |item| -%>
  <%= item.shelf_display_name.localize %> <%= item.call_number %> <%= item.item_identifier %>
 <% end -%>
 

data/app/views/notifier/manifestation_info.ja.text.erb

@@ -7,7 +7,7 @@
 ISBN: <%= @manifestation.identifier_contents(:isbn).join(" ") %>
 URL: <%= @manifestation.access_address %>
 所蔵場所:
-<% @manifestation.items.for_checkout.on_shelf.each do |item| -%>
+<% @manifestation.items.on_shelf.each do |item| -%>
  <%= item.shelf_display_name.localize %> <%= item.call_number %> <%= item.item_identifier %>
 <% end -%>
 

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

@@ -30,16 +30,6 @@
     <%= f.text_field :picture_file_name -%>
   </div>
 
-  <div class="field">
-    <%= f.label :width -%><br />
-    <%= f.text_field :width -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :height -%><br />
-    <%= f.text_field :height -%>
-  </div>
-
   <div class="actions">
     <%= f.submit %>
   </div>

data/app/views/resource_export_files/_form.html.erb

@@ -9,7 +9,7 @@
   </div>
   <div class="field">
     <%= f.label :resource_export %><br>
-    <%= f.text_field :resource_export %>
+    <%= f.file_field :resource_export %>
   </div>
   -->
   <div class="actions">

data/config/locales/translation_en.yml

@@ -49,7 +49,7 @@ en:
         title_alternative: Titlte alternative
         title_transcription: Title transcription
         classification_number: Classification number
-        manifestation_identifier: Manifestation identifier
+        manifestation_identifier: Local manifestation identifier
         date_of_publication: Date of publication
         pub_date: Date of publication
         deleted_at: Deleted at
@@ -116,6 +116,8 @@ en:
         binding_item_identifier: Binding item identifier
         binding_call_number: Binding call number
         binded_at: Binded at
+        budget_type_id: Budget type
+        bookstore_id: Bookstore
       agent:
         last_name: Last name
         middle_name: Middle name

data/config/locales/translation_ja.yml

@@ -49,7 +49,7 @@ ja:
         title_alternative: 代替タイトル
         title_transcription: タイトルのヨミ
         classification_number: 分類番号
-        manifestation_identifier: 識別子
+        manifestation_identifier: ローカル識別子
         date_of_publication: 出版日
         pub_date: 出版日
         deleted_at: 削除時刻
@@ -116,6 +116,8 @@ ja:
         binding_item_identifier: 製本後の所蔵情報ID
         binding_call_number: 製本後の請求記号
         binded_at: 製本日
+        budget_type_id: 予算種別
+        bookstore_id: 書店
       agent:
         last_name: 姓
         middle_name: ミドルネーム

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre66"
+  VERSION = "0.1.0.pre67"
 end

data/spec/controllers/items_controller_spec.rb

@@ -255,7 +255,7 @@ describe ItemsController do
         it "should create a lending policy" do
           old_lending_policy_count = LendingPolicy.count
           post :create, :item => @attrs
-          LendingPolicy.count.should eq old_lending_policy_count + UserGroup.count
+          LendingPolicy.count.should eq old_lending_policy_count
         end
       end
 

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

@@ -25,7 +25,6 @@
           Create,
           CreateType,
           Donate,
-          Exemplify,
           Identifier,
           ImportRequest,
           ManifestationRelationship,
@@ -89,7 +88,6 @@
         can :manage, [
           Create,
           Donate,
-          Exemplify,
           Identifier,
           ImportRequest,
           ManifestationRelationship,
@@ -153,7 +151,6 @@
           ContentType,
           Country,
           Create,
-          Exemplify,
           Identifier,
           Frequency,
           FormOfWork,
@@ -184,7 +181,6 @@
           ContentType,
           Country,
           Create,
-          Exemplify,
           Frequency,
           FormOfWork,
           Identifier,

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

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
+  devise :database_authenticatable, #:registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model

data/spec/dummy/db/schema.rb

@@ -542,17 +542,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
   add_index "events", ["event_category_id"], name: "index_events_on_event_category_id"
   add_index "events", ["library_id"], name: "index_events_on_library_id"
 
-  create_table "exemplifies", force: :cascade do |t|
-    t.integer  "manifestation_id", null: false
-    t.integer  "item_id",          null: false
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "exemplifies", ["item_id"], name: "index_exemplifies_on_item_id", unique: true
-  add_index "exemplifies", ["manifestation_id"], name: "index_exemplifies_on_manifestation_id"
-
   create_table "form_of_works", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"

data/spec/factories/user.rb

@@ -2,7 +2,6 @@ FactoryGirl.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
     f.after(:create) do |user|
@@ -16,7 +15,6 @@ FactoryGirl.define do
   factory :librarian, :class => User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
     f.after(:create) do |user|
@@ -30,7 +28,6 @@ FactoryGirl.define do
   factory :user, :class => User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
     f.after(:create) do |user|

data/spec/models/item_spec.rb

@@ -42,12 +42,12 @@ describe Item do
     Item.for_checkout.include?(items(:item_00023)).should be_falsy
   end
 
-  it "should update lending policies" do
+  it "should delete lending policies" do
     item = items(:item_00001)
     item.checkout_type = CheckoutType.where(:name => 'serial').first
     item.save
     item.reload
-    item.lending_policies.where(:user_group_id => 1).first.loan_period.should eq 10
+    item.lending_policies.count.should eq 0
   end
 
   it "should not create item without manifestation_id" do

data/spec/models/resource_import_file_spec.rb

@@ -122,7 +122,7 @@ describe ResourceImportFile do
         @file.executed_at.should be_truthy
 
         @file.reload
-        @file.error_message.should eq "The follwing column(s) were ignored: invalid"
+        @file.error_message.should eq "The following column(s) were ignored: invalid"
       end
 
       it "should send message when import is completed", vcr: true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre66
+  version: 0.1.0.pre67
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -296,112 +296,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc19
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre29
+        version: 0.1.0.pre31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre29
+        version: 0.1.0.pre31
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.11.pre11
+        version: 0.1.11.pre12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.11.pre11
+        version: 0.1.11.pre12
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre21
+        version: 0.1.2.pre22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre21
+        version: 0.1.2.pre22
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre25
+        version: 0.1.17.pre26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre25
+        version: 0.1.17.pre26
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre18
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre44
+        version: 0.1.0.pre46
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre44
+        version: 0.1.0.pre46
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre36
+        version: 0.1.0.pre37
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre36
+        version: 0.1.0.pre37
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -555,7 +555,6 @@ files:
 - app/models/create_type.rb
 - app/models/donate.rb
 - app/models/enju_biblio/ability.rb
-- app/models/exemplify.rb
 - app/models/form_of_work.rb
 - app/models/frequency.rb
 - app/models/identifier.rb
@@ -730,9 +729,12 @@ files:
 - app/views/manifestation_relationships/index.html.erb
 - app/views/manifestation_relationships/new.html.erb
 - app/views/manifestation_relationships/show.html.erb
+- app/views/manifestations/_all_facet.html.erb
 - app/views/manifestations/_attachment_file.html.erb
 - app/views/manifestations/_book_jacket.html.erb
 - app/views/manifestations/_call_number.html.erb
+- app/views/manifestations/_carrier_type_facet.html.erb
+- app/views/manifestations/_classification_facet.html.erb
 - app/views/manifestations/_edit_detail.html.erb
 - app/views/manifestations/_edition_and_number.html.erb
 - app/views/manifestations/_form.html.erb
@@ -746,12 +748,16 @@ files:
 - app/views/manifestations/_index_form_parent.html.erb
 - app/views/manifestations/_index_form_publisher.html.erb
 - app/views/manifestations/_index_form_series_statement.html.erb
+- app/views/manifestations/_language_facet.html.erb
+- app/views/manifestations/_library_facet.html.erb
 - app/views/manifestations/_list.html.erb
 - app/views/manifestations/_manifestation.html.erb
 - app/views/manifestations/_manifestation_list.html.erb
 - app/views/manifestations/_not_found.html.erb
 - app/views/manifestations/_paginate_id_link.html.erb
 - app/views/manifestations/_pickup.html.erb
+- app/views/manifestations/_pub_year_facet.html.erb
+- app/views/manifestations/_reservable_facet.html.erb
 - app/views/manifestations/_search_engine.html.erb
 - app/views/manifestations/_session_ids.html.erb
 - app/views/manifestations/_show.mods.builder
@@ -763,6 +769,7 @@ files:
 - app/views/manifestations/_show_group.html.erb
 - app/views/manifestations/_show_holding.html.erb
 - app/views/manifestations/_show_holding.mobile.erb
+- app/views/manifestations/_show_holding_toggle.html.erb
 - app/views/manifestations/_show_index.html.erb
 - app/views/manifestations/_show_index.mobile.erb
 - app/views/manifestations/_show_parent.html.erb
@@ -788,6 +795,7 @@ files:
 - app/views/manifestations/index.txt.erb
 - app/views/manifestations/new.html.erb
 - app/views/manifestations/show.html.erb
+- app/views/manifestations/show.js.erb
 - app/views/manifestations/show.mobile.erb
 - app/views/manifestations/show.mods.builder
 - app/views/manifestations/show.rdf.builder
@@ -893,7 +901,6 @@ files:
 - db/migrate/133_create_agent_merges.rb
 - db/migrate/134_create_agent_merge_lists.rb
 - db/migrate/20080830154109_create_realizes.rb
-- db/migrate/20080830172106_create_exemplifies.rb
 - db/migrate/20080905191442_create_agent_types.rb
 - db/migrate/20081025083323_create_countries.rb
 - db/migrate/20081025083905_create_languages.rb
@@ -1225,7 +1232,6 @@ files:
 - spec/factories/create.rb
 - spec/factories/create_types.rb
 - spec/factories/donate.rb
-- spec/factories/exemplify.rb
 - spec/factories/form_of_work.rb
 - spec/factories/frequency.rb
 - spec/factories/identifier.rb
@@ -1282,7 +1288,6 @@ files:
 - spec/fixtures/donates.yml
 - spec/fixtures/event_categories.yml
 - spec/fixtures/events.yml
-- spec/fixtures/exemplifies.yml
 - spec/fixtures/form_of_works.yml
 - spec/fixtures/frequencies.yml
 - spec/fixtures/identifier_types.yml
@@ -1349,7 +1354,6 @@ files:
 - spec/models/create_spec.rb
 - spec/models/create_type_spec.rb
 - spec/models/donate_spec.rb
-- spec/models/exemplify_spec.rb
 - spec/models/form_of_work_spec.rb
 - spec/models/frequency_spec.rb
 - spec/models/identifier_spec.rb
@@ -1700,7 +1704,6 @@ test_files:
 - spec/factories/create.rb
 - spec/factories/create_types.rb
 - spec/factories/donate.rb
-- spec/factories/exemplify.rb
 - spec/factories/form_of_work.rb
 - spec/factories/frequency.rb
 - spec/factories/identifier.rb
@@ -1757,7 +1760,6 @@ test_files:
 - spec/fixtures/donates.yml
 - spec/fixtures/event_categories.yml
 - spec/fixtures/events.yml
-- spec/fixtures/exemplifies.yml
 - spec/fixtures/form_of_works.yml
 - spec/fixtures/frequencies.yml
 - spec/fixtures/identifier_types.yml
@@ -1824,7 +1826,6 @@ test_files:
 - spec/models/create_spec.rb
 - spec/models/create_type_spec.rb
 - spec/models/donate_spec.rb
-- spec/models/exemplify_spec.rb
 - spec/models/form_of_work_spec.rb
 - spec/models/frequency_spec.rb
 - spec/models/identifier_spec.rb