diff --git a/Gemfile b/Gemfile index c1d4d9f..f9838e8 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,8 @@ gemspec # your gemspec. These might include edge Rails or gems from your path or # Git. Remember to move these dependencies to your gemspec before releasing # your gem to rubygems.org. +gem 'enju_leaf', github: 'next-l/enju_leaf', branch: '1.2' +gem 'enju_seed', github: 'next-l/enju_seed', branch: '1.2' # To use debugger # gem 'debugger' diff --git a/enju_inter_library_loan.gemspec b/enju_inter_library_loan.gemspec index ccc63bf..8c53107 100644 --- a/enju_inter_library_loan.gemspec +++ b/enju_inter_library_loan.gemspec @@ -18,8 +18,7 @@ Gem::Specification.new do |s| s.add_dependency "enju_leaf", "~> 1.2.0.beta.1" s.add_dependency "enju_biblio", "~> 0.2.0.beta.1" - s.add_dependency "enju_library", "~> 0.2.0.beta.1" - s.add_dependency "enju_manifestation_viewer", "~> 0.2.0.beta.1" + s.add_dependency "enju_library", "~> 0.2.0.beta.2" s.add_dependency "statesman", "~> 1.3" s.add_development_dependency "sqlite3" diff --git a/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb index db81df5..9dd9281 100644 --- a/spec/dummy/app/controllers/application_controller.rb +++ b/spec/dummy/app/controllers/application_controller.rb @@ -1,8 +1,7 @@ class ApplicationController < ActionController::Base protect_from_forgery - include EnjuLeaf::Controller - include EnjuBiblio::Controller include EnjuLibrary::Controller + include EnjuBiblio::Controller after_action :verify_authorized include Pundit diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index b9107e2..0e313c1 100644 --- a/spec/dummy/db/schema.rb +++ b/spec/dummy/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20151213072705) do +ActiveRecord::Schema.define(version: 20160703190932) do create_table "accepts", force: :cascade do |t| t.integer "basket_id" @@ -466,6 +466,7 @@ t.integer "inter_library_loan_id" t.datetime "created_at" t.datetime "updated_at" + t.boolean "most_recent" end add_index "inter_library_loan_transitions", ["inter_library_loan_id"], name: "index_inter_library_loan_transitions_on_inter_library_loan_id"