enju_circulation 0.2.0 → 0.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/app/helpers/items_helper.rb +1 -1
  3. data/app/models/checked_item.rb +2 -1
  4. data/app/views/carrier_types/_carrier_type_has_checkout_type_fields.html.erb +1 -1
  5. data/lib/enju_circulation/version.rb +1 -1
  6. data/lib/tasks/enju_circulation_tasks.rake +3 -2
  7. data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb +152 -152
  8. data/spec/controllers/checked_items_controller_spec.rb +135 -135
  9. data/spec/controllers/checkins_controller_spec.rb +161 -161
  10. data/spec/controllers/checkout_types_controller_spec.rb +152 -152
  11. data/spec/controllers/checkouts_controller_spec.rb +103 -103
  12. data/spec/controllers/circulation_statuses_controller_spec.rb +152 -152
  13. data/spec/controllers/item_has_use_restrictions_controller_spec.rb +152 -152
  14. data/spec/controllers/lending_policies_controller_spec.rb +150 -150
  15. data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +152 -152
  16. data/spec/controllers/manifestation_reserve_stats_controller_spec.rb +152 -152
  17. data/spec/controllers/profiles_controller_spec.rb +4 -4
  18. data/spec/controllers/reserves_controller_spec.rb +249 -249
  19. data/spec/controllers/use_restrictions_controller_spec.rb +153 -153
  20. data/spec/controllers/user_checkout_stats_controller_spec.rb +152 -152
  21. data/spec/controllers/user_group_has_checkout_types_controller_spec.rb +150 -150
  22. data/spec/controllers/user_reserve_stats_controller_spec.rb +152 -152
  23. data/spec/dummy/db/schema.rb +12 -2
  24. data/spec/fixtures/checked_items.yml +2 -1
  25. data/spec/helpers/items_helper_spec.rb +0 -1
  26. data/spec/models/checked_item_spec.rb +2 -1
  27. metadata +3 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e8e45a007f5e1bd79db5834a3cc9f59537d40101
4
- data.tar.gz: 67a46a88e2de7672adf93db0c17e472db65cfba1
3
+ metadata.gz: 29980c1f8cd7b154a9a9f4eb904ae86f3b959be4
4
+ data.tar.gz: 2ff5cc3855774b1bfe3cfdd62089f48f8dde5fb0
5
5
  SHA512:
6
- metadata.gz: ced6e1199e3b8624650ccf110a0d7373ddd58bad32c8ad0aae174fa5dfd600cbaeaaf870e261178ee0fc25af99c9960d0885e68068e58c5dbff1b5643010040b
7
- data.tar.gz: 0b82b401e7c112418e7ba07d9bff35cece5581f27ada7e671c73e6349278e1a30ee1140064d62b14c3364d478e9f98209f338bf33fa65363894a08e642bde2f1
6
+ metadata.gz: f3681282a28db364eadf947792ee57ac3214e559749a576d22838a6c7ec31a5561e20ef7bf33ff7d169dbb911dec8291fd1248957c50bd98bf8ccb29dcfe6a5a
7
+ data.tar.gz: b53caf13e1f55a3c0bd2b56e019c325368be37e3bf8811aee337e17188aeece051d74607b53b669d684721219f8bf62265e062cd143e5a485b68f5e2a59f414f
data/app/helpers/items_helper.rb CHANGED
@@ -3,7 +3,7 @@ module ItemsHelper
3
3
  string = ''
4
4
  circulation_status = CirculationStatus.where(name: facet.value).select([:name, :display_name]).first
5
5
  if circulation_status
6
- string << form_icon(circulation_status)
6
+ #string << form_icon(circulation_status)
7
7
  current = true if params[:circulation_status] == circulation_status.name
8
8
  if current
9
9
  content_tag :strong do
data/app/models/checked_item.rb CHANGED
@@ -128,8 +128,9 @@ end
128
128
  # id :integer not null, primary key
129
129
  # item_id :integer not null
130
130
  # basket_id :integer not null
131
+ # librarian_id :integer
131
132
  # due_date :datetime not null
132
133
  # created_at :datetime
133
134
  # updated_at :datetime
134
- # librarian_id :integer
135
+ # user_id :integer
135
136
  #
data/app/views/carrier_types/_carrier_type_has_checkout_type_fields.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <div class="nested-fields">
2
2
  <%= f.label :checkout_type_id -%>
3
3
  <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) %>
4
- <%= f.link_to_remove t('page.remove'), data: {confirm: t('page.are_you_sure')} %>
4
+ <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
5
5
  </div>
data/lib/enju_circulation/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuCirculation
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.1"
3
3
  end
data/lib/tasks/enju_circulation_tasks.rake CHANGED
@@ -5,8 +5,9 @@ require 'tasks/reserve'
5
5
  require 'tasks/use_restriction'
6
6
 
7
7
  namespace :enju_circulation do
8
- desc "create initial records for enju_circulation"
9
- task :setup => :environment do
8
+ desc 'create initial records for enju_circulation'
9
+ task setup: :environment do
10
+ ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_circulation', 'checkout_types')
10
11
  Dir.glob(Rails.root.to_s + '/db/fixtures/enju_circulation/*.yml').each do |file|
11
12
  ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_circulation', File.basename(file, '.*'))
12
13
  end