enju_circulation 0.1.0.pre36 → 0.1.0.pre37
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/carrier_type_has_checkout_types_controller.rb +11 -11
- data/app/controllers/checked_items_controller.rb +13 -13
- data/app/controllers/checkins_controller.rb +14 -15
- data/app/controllers/checkout_types_controller.rb +10 -10
- data/app/controllers/checkouts_controller.rb +18 -19
- data/app/controllers/item_has_use_restrictions_controller.rb +10 -10
- data/app/controllers/lending_policies_controller.rb +1 -1
- data/app/controllers/manifestation_checkout_stats_controller.rb +15 -13
- data/app/controllers/manifestation_reserve_stats_controller.rb +15 -13
- data/app/controllers/reserves_controller.rb +27 -28
- data/app/controllers/user_checkout_stats_controller.rb +15 -13
- data/app/controllers/user_group_has_checkout_types_controller.rb +11 -11
- data/app/controllers/user_reserve_stats_controller.rb +15 -13
- data/app/models/carrier_type_has_checkout_type.rb +6 -6
- data/app/models/checked_item.rb +20 -18
- data/app/models/checkin.rb +13 -14
- data/app/models/checkout.rb +20 -21
- data/app/models/checkout_stat_has_manifestation.rb +2 -2
- data/app/models/checkout_stat_has_user.rb +2 -2
- data/app/models/checkout_type.rb +9 -9
- data/app/models/circulation_status.rb +13 -3
- data/app/models/enju_circulation/ability.rb +1 -1
- data/app/models/item_has_use_restriction.rb +3 -3
- data/app/models/lending_policy.rb +4 -4
- data/app/models/manifestation_checkout_stat.rb +4 -3
- data/app/models/manifestation_checkout_stat_transition.rb +13 -0
- data/app/models/manifestation_reserve_stat.rb +4 -3
- data/app/models/manifestation_reserve_stat_transition.rb +13 -0
- data/app/models/reserve.rb +123 -157
- data/app/models/reserve_stat_has_manifestation.rb +2 -2
- data/app/models/reserve_stat_has_user.rb +2 -2
- data/app/models/reserve_state_machine.rb +93 -0
- data/app/models/reserve_transition.rb +20 -0
- data/app/models/use_restriction.rb +5 -5
- data/app/models/user_checkout_stat.rb +4 -3
- data/app/models/user_checkout_stat_transition.rb +13 -0
- data/app/models/user_group_has_checkout_type.rb +8 -8
- data/app/models/user_reserve_stat.rb +4 -3
- data/app/models/user_reserve_stat_transition.rb +13 -0
- data/app/views/carrier_type_has_checkout_types/_form.html.erb +3 -3
- data/app/views/carrier_type_has_checkout_types/edit.html.erb +1 -1
- data/app/views/carrier_type_has_checkout_types/index.html.erb +3 -3
- data/app/views/carrier_type_has_checkout_types/new.html.erb +1 -1
- data/app/views/carrier_type_has_checkout_types/show.html.erb +1 -1
- data/app/views/carrier_types/_checkout_form.html.erb +1 -1
- data/app/views/checked_items/_checked_item.html.erb +3 -3
- data/app/views/checked_items/_checkout.html.erb +3 -3
- data/app/views/checked_items/_list.html.erb +3 -3
- data/app/views/checked_items/edit.html.erb +1 -1
- data/app/views/checked_items/index.html.erb +1 -1
- data/app/views/checked_items/new.html.erb +3 -3
- data/app/views/checked_items/show.html.erb +1 -1
- data/app/views/checkins/_checkin.html.erb +3 -3
- data/app/views/checkins/_form.html.erb +1 -1
- data/app/views/checkins/_list.html.erb +2 -2
- data/app/views/checkins/edit.html.erb +1 -1
- data/app/views/checkins/index.html.erb +2 -2
- data/app/views/checkins/new.html.erb +3 -3
- data/app/views/checkins/show.html.erb +1 -1
- data/app/views/checkout_types/_form.html.erb +2 -2
- data/app/views/checkout_types/edit.html.erb +1 -1
- data/app/views/checkout_types/index.html.erb +4 -4
- data/app/views/checkout_types/new.html.erb +1 -1
- data/app/views/checkout_types/show.html.erb +2 -2
- data/app/views/checkouts/_index.html.erb +7 -7
- data/app/views/checkouts/_index_item.html.erb +5 -5
- data/app/views/checkouts/_index_overdue.html.erb +7 -7
- data/app/views/checkouts/_index_user.html.erb +13 -13
- data/app/views/checkouts/_list.html.erb +5 -5
- data/app/views/checkouts/_reserved_facet.html.erb +2 -2
- data/app/views/checkouts/edit.html.erb +8 -8
- data/app/views/checkouts/index.atom.builder +3 -3
- data/app/views/checkouts/index.html.erb +3 -3
- data/app/views/checkouts/index.rss.builder +9 -9
- data/app/views/checkouts/index.txt.erb +4 -0
- data/app/views/checkouts/new.html.erb +2 -2
- data/app/views/checkouts/show.html.erb +7 -7
- data/app/views/circulation_statuses/_form.html.erb +2 -2
- data/app/views/circulation_statuses/edit.html.erb +1 -1
- data/app/views/circulation_statuses/index.html.erb +3 -3
- data/app/views/circulation_statuses/new.html.erb +1 -1
- data/app/views/circulation_statuses/show.html.erb +1 -1
- data/app/views/item_has_use_restrictions/edit.html.erb +1 -1
- data/app/views/item_has_use_restrictions/index.html.erb +4 -4
- data/app/views/item_has_use_restrictions/new.html.erb +2 -2
- data/app/views/item_has_use_restrictions/show.html.erb +1 -1
- data/app/views/lending_policies/_form.html.erb +1 -1
- data/app/views/lending_policies/edit.html.erb +1 -1
- data/app/views/lending_policies/index.html.erb +2 -2
- data/app/views/lending_policies/new.html.erb +1 -1
- data/app/views/lending_policies/show.html.erb +2 -2
- data/app/views/manifestation_checkout_stats/_form.html.erb +1 -1
- data/app/views/manifestation_checkout_stats/edit.html.erb +1 -1
- data/app/views/manifestation_checkout_stats/index.html.erb +3 -4
- data/app/views/manifestation_checkout_stats/new.html.erb +1 -1
- data/app/views/manifestation_checkout_stats/show.html.erb +3 -4
- data/app/views/manifestation_checkout_stats/show.txt.erb +4 -0
- data/app/views/manifestation_reserve_stats/_form.html.erb +1 -1
- data/app/views/manifestation_reserve_stats/edit.html.erb +1 -1
- data/app/views/manifestation_reserve_stats/index.html.erb +3 -4
- data/app/views/manifestation_reserve_stats/new.html.erb +1 -1
- data/app/views/manifestation_reserve_stats/show.html.erb +3 -4
- data/app/views/manifestation_reserve_stats/show.txt.erb +4 -0
- data/app/views/my_accounts/_feed_token.html.erb +3 -3
- data/app/views/reserves/_form.html.erb +1 -1
- data/app/views/reserves/_new.html.erb +9 -9
- data/app/views/reserves/_new_user.html.erb +13 -13
- data/app/views/reserves/_state_facet.html.erb +2 -2
- data/app/views/reserves/_title.html.erb +1 -1
- data/app/views/reserves/edit.html.erb +7 -7
- data/app/views/reserves/index.atom.builder +3 -3
- data/app/views/reserves/index.html.erb +26 -26
- data/app/views/reserves/index.rss.builder +10 -10
- data/app/views/reserves/index.txt.erb +4 -0
- data/app/views/reserves/show.html.erb +9 -9
- data/app/views/use_restrictions/_form.html.erb +2 -2
- data/app/views/use_restrictions/edit.html.erb +1 -1
- data/app/views/use_restrictions/index.html.erb +3 -3
- data/app/views/use_restrictions/new.html.erb +1 -1
- data/app/views/use_restrictions/show.html.erb +1 -1
- data/app/views/user_checkout_stats/_form.html.erb +1 -1
- data/app/views/user_checkout_stats/edit.html.erb +1 -1
- data/app/views/user_checkout_stats/index.html.erb +3 -4
- data/app/views/user_checkout_stats/new.html.erb +1 -1
- data/app/views/user_checkout_stats/show.html.erb +3 -4
- data/app/views/user_checkout_stats/show.txt.erb +4 -0
- data/app/views/user_group_has_checkout_types/edit.html.erb +7 -7
- data/app/views/user_group_has_checkout_types/index.html.erb +3 -3
- data/app/views/user_group_has_checkout_types/new.html.erb +9 -9
- data/app/views/user_group_has_checkout_types/show.html.erb +1 -1
- data/app/views/user_groups/_checkout_form.html.erb +6 -6
- data/app/views/user_reserve_stats/_form.html.erb +1 -1
- data/app/views/user_reserve_stats/edit.html.erb +1 -1
- data/app/views/user_reserve_stats/index.html.erb +3 -4
- data/app/views/user_reserve_stats/new.html.erb +1 -1
- data/app/views/user_reserve_stats/show.html.erb +3 -4
- data/app/views/user_reserve_stats/show.txt.erb +4 -0
- data/app/views/users/_feed_token.html.erb +3 -3
- data/config/initializers/inflections.rb +3 -0
- data/config/locales/translation_en.yml +6 -0
- data/config/locales/translation_ja.yml +6 -0
- data/config/routes.rb +8 -10
- data/db/migrate/035_create_reserves.rb +0 -1
- data/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +0 -1
- data/db/migrate/20081215094302_create_user_checkout_stats.rb +0 -1
- data/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +0 -1
- data/db/migrate/20081220023628_create_user_reserve_stats.rb +0 -1
- data/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +0 -4
- data/db/migrate/20140518050147_create_reserve_transitions.rb +14 -0
- data/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +12 -0
- data/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +6 -0
- data/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +5 -0
- data/lib/enju_circulation/engine.rb +0 -4
- data/lib/enju_circulation/item.rb +4 -4
- data/lib/enju_circulation/manifestation.rb +2 -2
- data/lib/enju_circulation/profile.rb +26 -0
- data/lib/enju_circulation/user.rb +1 -1
- data/lib/enju_circulation/version.rb +1 -1
- data/lib/enju_circulation.rb +2 -0
- data/lib/generators/enju_circulation/setup/setup_generator.rb +2 -0
- data/lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml +48 -25
- data/lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml +39 -13
- data/lib/tasks/circulation_status.rb +6 -0
- data/lib/tasks/enju_circulation_tasks.rake +14 -0
- data/lib/tasks/reserve.rb +5 -0
- data/lib/tasks/use_restriction.rb +6 -0
- data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb +21 -21
- data/spec/controllers/checkins_controller_spec.rb +22 -22
- data/spec/controllers/checkout_types_controller_spec.rb +21 -21
- data/spec/controllers/checkouts_controller_spec.rb +14 -14
- data/spec/controllers/circulation_statuses_controller_spec.rb +21 -21
- data/spec/controllers/item_has_use_restrictions_controller_spec.rb +21 -21
- data/spec/controllers/lending_policies_controller_spec.rb +21 -21
- data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +21 -21
- data/spec/controllers/manifestation_reserve_stats_controller_spec.rb +21 -21
- data/spec/controllers/reserves_controller_spec.rb +32 -32
- data/spec/controllers/use_restrictions_controller_spec.rb +21 -21
- data/spec/controllers/user_checkout_stats_controller_spec.rb +21 -21
- data/spec/controllers/user_group_has_checkout_types_controller_spec.rb +21 -21
- data/spec/controllers/user_reserve_stats_controller_spec.rb +21 -21
- data/spec/dummy/app/models/user.rb +2 -46
- data/spec/dummy/config/environments/test.rb +2 -0
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/migrate/001_create_agents.rb +0 -8
- data/spec/dummy/db/migrate/005_create_manifestations.rb +7 -12
- data/spec/dummy/db/migrate/006_create_items.rb +0 -6
- data/spec/dummy/db/migrate/112_create_frequencies.rb +12 -0
- data/spec/dummy/db/migrate/117_create_form_of_works.rb +12 -0
- data/spec/dummy/db/migrate/154_create_messages.rb +0 -1
- data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +0 -2
- data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +20 -0
- data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +20 -0
- data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +15 -0
- data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +15 -0
- data/spec/dummy/db/migrate/20090719201843_create_extents.rb +12 -0
- data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +12 -0
- data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +12 -0
- data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +12 -0
- data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +14 -0
- data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +15 -0
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +12 -0
- data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +9 -0
- data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +11 -0
- data/spec/dummy/db/migrate/20111201155456_devise_create_users.rb +42 -0
- data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +6 -0
- data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +6 -0
- data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +6 -0
- data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +6 -0
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +16 -0
- data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +7 -0
- data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +5 -0
- data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +6 -0
- data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +20 -0
- data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +11 -0
- data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +8 -0
- data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +6 -0
- data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +5 -0
- data/spec/dummy/db/schema.rb +315 -56
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/solr/conf/admin-extra.html +31 -0
- data/spec/dummy/solr/conf/elevate.xml +36 -0
- data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
- data/spec/dummy/solr/conf/protwords.txt +21 -0
- data/spec/dummy/solr/conf/schema.xml +255 -0
- data/spec/dummy/solr/conf/scripts.conf +24 -0
- data/spec/dummy/solr/conf/solrconfig.xml +667 -0
- data/spec/dummy/solr/conf/spellings.txt +2 -0
- data/spec/dummy/solr/conf/stopwords.txt +58 -0
- data/spec/dummy/solr/conf/synonyms.txt +31 -0
- data/spec/dummy/solr/default/data/index/_7f0.fdt +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.fdx +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.fnm +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.nvd +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.nvm +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.si +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.pos +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tim +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/segments.gen +0 -0
- data/spec/dummy/solr/default/data/index/segments_bvw +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015394 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015395 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015396 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015397 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015398 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015399 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015400 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015401 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015402 +0 -0
- data/spec/dummy/solr/development/data/index/segments.gen +0 -0
- data/spec/dummy/solr/development/data/index/segments_1 +0 -0
- data/spec/dummy/solr/solr.xml +8 -0
- data/spec/dummy/solr/test/data/index/segments.gen +0 -0
- data/spec/dummy/solr/test/data/index/segments_1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/0007f9aec08cc2727b3d00cd62cf1d0f +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/129cec5384c0f26fcfb0ce65048298c5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/181c975b1296d7ebe81714d5e64bc098 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1e58a07a3701da9fb9c176d67162af2b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2b35ad8fee7e1228e205669278e2adda +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2f09f58943a88f21e3a0318621391785 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2ffe508d0533d0afd2a37bb574eda40d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3753d928863ee65118b9f2da1c6e504d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/40e90f0c329b14292a9ff1a2fe907b39 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/49a3464eb6bcffb3d9f5b47b133edabb +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/49d32c13d390c1b80d8b2705aac86579 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/50e64f45f0cb4cee52fd3f3908f89a82 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/51f7d34a9e9bebb47b7201cfebfec34d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5995180d1cfd7cad71ec6d9e1a538f0e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/604e0e4b3c01d488d6fb087e9fdaeb94 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6401fc09d2b894df2ad251b007df145a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/65a8d4d288e5f082f0166aa7be7a2464 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6f5d66df18892df6af39c9cfd784f0f5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6fcdd2234a7c25f9d4179ca12fd9f7b4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6fdb4513af157010ef79b56df44d665e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/750439d8043ed022910956fbb55faa65 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/811e5198d0dc4efe02d28c0c2215e207 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/83ea20e0b25e77f5dce5bf733b088292 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9604073a83f822f13caaabd7e157bbbb +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9cfe4d48f5258863dbfb3623c797fb15 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/a296264dcc89e1f8ab6382e678ffbe38 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/abee2d4cb18d15789dcdc9c680f3e6de +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c1ab0ecf3cf57db41d9e4cd9306d8829 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c4a984c6feb506f3e1f9120a8d029bda +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ccdcb26ebc6ef3b684368b368edf4f99 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d34b5413caa9407126db68d5d590804a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d4ac74c17332ad931b72f42d7997fcc0 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/dd672deb061233e0db1d2f413d27213f +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e2d21478696ac96ad895f7c3b8d31594 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e9738177de2083b68d42e053a1529244 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e9ce2df3f0160329df69b22a911dbd04 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f2e83d3b5fe984832bfeff09b0e3b8d2 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f90eee17e0e5eaea50e6064ded54617c +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fa8e81ce1d45228121b9df5618542190 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fbdc1d9347cb228f06807b76c6c2974e +0 -0
- data/spec/dummy/tmp/cache/stdout +1262 -0
- data/spec/dummy/tmp/pids/redis-test.pid +1 -0
- data/spec/factories/profile.rb +9 -0
- data/spec/factories/reserve.rb +7 -1
- data/spec/factories/user.rb +3 -9
- data/spec/fixtures/agents.yml +0 -12
- data/spec/fixtures/checkouts.yml +12 -1
- data/spec/fixtures/items.yml +48 -25
- data/spec/fixtures/manifestation_checkout_stats.yml +3 -4
- data/spec/fixtures/manifestation_reserve_stats.yml +3 -4
- data/spec/fixtures/message_requests.yml +0 -3
- data/spec/fixtures/message_templates.yml +41 -20
- data/spec/fixtures/profiles.yml +83 -0
- data/spec/fixtures/reserve_transitions.yml +88 -0
- data/spec/fixtures/reserves.yml +1 -18
- data/spec/fixtures/user_checkout_stats.yml +3 -4
- data/spec/fixtures/user_groups.yml +3 -3
- data/spec/fixtures/user_reserve_stats.yml +3 -4
- data/spec/fixtures/users.yml +0 -55
- data/spec/models/checked_item_spec.rb +2 -1
- data/spec/models/checkout_spec.rb +0 -1
- data/spec/models/manifestation_checkout_stat_spec.rb +4 -2
- data/spec/models/manifestation_reserve_stat_spec.rb +4 -2
- data/spec/models/reserve_spec.rb +9 -11
- data/spec/models/user_checkout_stat_spec.rb +4 -2
- data/spec/models/user_reserve_stat_spec.rb +4 -2
- data/spec/support/resque.rb +25 -22
- metadata +325 -92
- data/app/controllers/checkout_stat_has_manifestations_controller.rb +0 -81
- data/app/controllers/checkout_stat_has_users_controller.rb +0 -81
- data/app/controllers/reserve_stat_has_manifestations_controller.rb +0 -81
- data/app/controllers/reserve_stat_has_users_controller.rb +0 -81
- data/app/models/circulation_sweeper.rb +0 -24
- data/app/views/checkout_stat_has_manifestations/_form.html.erb +0 -15
- data/app/views/checkout_stat_has_manifestations/edit.html.erb +0 -13
- data/app/views/checkout_stat_has_manifestations/index.html.erb +0 -33
- data/app/views/checkout_stat_has_manifestations/new.html.erb +0 -12
- data/app/views/checkout_stat_has_manifestations/show.html.erb +0 -28
- data/app/views/checkout_stat_has_users/_form.html.erb +0 -15
- data/app/views/checkout_stat_has_users/edit.html.erb +0 -13
- data/app/views/checkout_stat_has_users/index.html.erb +0 -33
- data/app/views/checkout_stat_has_users/new.html.erb +0 -12
- data/app/views/checkout_stat_has_users/show.html.erb +0 -28
- data/app/views/checkouts/index.csv.erb +0 -4
- data/app/views/manifestation_checkout_stats/show.csv.erb +0 -4
- data/app/views/manifestation_reserve_stats/show.csv.erb +0 -4
- data/app/views/reserve_stat_has_manifestations/_form.html.erb +0 -15
- data/app/views/reserve_stat_has_manifestations/edit.html.erb +0 -13
- data/app/views/reserve_stat_has_manifestations/index.html.erb +0 -33
- data/app/views/reserve_stat_has_manifestations/new.html.erb +0 -12
- data/app/views/reserve_stat_has_manifestations/show.html.erb +0 -28
- data/app/views/reserve_stat_has_users/_form.html.erb +0 -15
- data/app/views/reserve_stat_has_users/edit.html.erb +0 -13
- data/app/views/reserve_stat_has_users/index.html.erb +0 -33
- data/app/views/reserve_stat_has_users/new.html.erb +0 -12
- data/app/views/reserve_stat_has_users/show.html.erb +0 -28
- data/app/views/reserves/index.csv.erb +0 -4
- data/app/views/user_checkout_stats/show.csv.erb +0 -4
- data/app/views/user_reserve_stats/show.csv.erb +0 -4
- data/db/fixtures/carrier_type_has_checkout_types.yml +0 -8
- data/db/fixtures/checkout_types.yml +0 -22
- data/db/fixtures/circulation_statuses.yml +0 -92
- data/db/fixtures/use_restrictions.yml +0 -79
- data/db/migrate/20130303104849_add_state_index_to_reserve.rb +0 -5
- data/spec/controllers/checkout_stat_has_manifestations_controller_spec.rb +0 -441
- data/spec/controllers/checkout_stat_has_users_controller_spec.rb +0 -441
- data/spec/controllers/reserve_stat_has_manifestations_controller_spec.rb +0 -441
- data/spec/controllers/reserve_stat_has_users_controller_spec.rb +0 -441
- data/spec/dummy/app/mailers/notifier.rb +0 -29
- data/spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb +0 -13
- data/spec/dummy/db/migrate/20111201155456_create_users.rb +0 -16
- data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb +0 -44
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 01334aaf40897445116e546ee2c9d828d0606ad1
|
4
|
+
data.tar.gz: 2463b399fc752361c6b24eb7d104748b8c7acbf4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3fce694d0b9db2e9a7074b281406504b316976e824556b6c81b790f3450c93cd8c681f8be8c3be6ca32cc69a33c3984153b321d47d895813426954f2f1909151
|
7
|
+
data.tar.gz: 59f4457eb47388dfa0e6f1f43e2b979e7ccc808298593c6352b40d1a979a2a8e058cddb8e692d6ec4f5d01c89b8a6da1e4057c6eb29e1888064b401965241a4a
|
@@ -1,7 +1,7 @@
|
|
1
1
|
class CarrierTypeHasCheckoutTypesController < ApplicationController
|
2
2
|
load_and_authorize_resource
|
3
3
|
before_filter :get_checkout_type
|
4
|
-
before_filter :prepare_options, :
|
4
|
+
before_filter :prepare_options, only: [:new, :edit]
|
5
5
|
|
6
6
|
# GET /carrier_type_has_checkout_types
|
7
7
|
# GET /carrier_type_has_checkout_types.json
|
@@ -10,7 +10,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
|
|
10
10
|
|
11
11
|
respond_to do |format|
|
12
12
|
format.html # index.html.erb
|
13
|
-
format.json { render :
|
13
|
+
format.json { render json: @carrier_type_has_checkout_types }
|
14
14
|
end
|
15
15
|
end
|
16
16
|
|
@@ -19,7 +19,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
|
|
19
19
|
def show
|
20
20
|
respond_to do |format|
|
21
21
|
format.html # show.html.erb
|
22
|
-
format.json { render :
|
22
|
+
format.json { render json: @carrier_type_has_checkout_type }
|
23
23
|
end
|
24
24
|
end
|
25
25
|
|
@@ -32,7 +32,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
|
|
32
32
|
|
33
33
|
respond_to do |format|
|
34
34
|
format.html # new.html.erb
|
35
|
-
format.json { render :
|
35
|
+
format.json { render json: @carrier_type_has_checkout_type }
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
@@ -47,13 +47,13 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
|
|
47
47
|
|
48
48
|
respond_to do |format|
|
49
49
|
if @carrier_type_has_checkout_type.save
|
50
|
-
flash[:notice] = t('controller.successfully_created', :
|
50
|
+
flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.carrier_type_has_checkout_type'))
|
51
51
|
format.html { redirect_to @carrier_type_has_checkout_type }
|
52
|
-
format.json { render :
|
52
|
+
format.json { render json: @carrier_type_has_checkout_type, status: :created, location: @carrier_type_has_checkout_type }
|
53
53
|
else
|
54
54
|
prepare_options
|
55
|
-
format.html { render :
|
56
|
-
format.json { render :
|
55
|
+
format.html { render action: "new" }
|
56
|
+
format.json { render json: @carrier_type_has_checkout_type.errors, status: :unprocessable_entity }
|
57
57
|
end
|
58
58
|
end
|
59
59
|
end
|
@@ -63,13 +63,13 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
|
|
63
63
|
def update
|
64
64
|
respond_to do |format|
|
65
65
|
if @carrier_type_has_checkout_type.update_attributes(params[:carrier_type_has_checkout_type])
|
66
|
-
flash[:notice] = t('controller.successfully_updated', :
|
66
|
+
flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.carrier_type_has_checkout_type'))
|
67
67
|
format.html { redirect_to @carrier_type_has_checkout_type }
|
68
68
|
format.json { head :no_content }
|
69
69
|
else
|
70
70
|
prepare_options
|
71
|
-
format.html { render :
|
72
|
-
format.json { render :
|
71
|
+
format.html { render action: "edit" }
|
72
|
+
format.json { render json: @carrier_type_has_checkout_type.errors, status: :unprocessable_entity }
|
73
73
|
end
|
74
74
|
end
|
75
75
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
class CheckedItemsController < ApplicationController
|
2
2
|
load_and_authorize_resource
|
3
|
-
before_filter :get_basket, :
|
3
|
+
before_filter :get_basket, only: [:index, :new, :create, :update]
|
4
4
|
|
5
5
|
# GET /checked_items
|
6
6
|
# GET /checked_items.json
|
@@ -14,7 +14,7 @@ class CheckedItemsController < ApplicationController
|
|
14
14
|
|
15
15
|
respond_to do |format|
|
16
16
|
format.html # index.html.erb
|
17
|
-
format.json { render :
|
17
|
+
format.json { render json: @checked_items }
|
18
18
|
format.js
|
19
19
|
end
|
20
20
|
end
|
@@ -24,7 +24,7 @@ class CheckedItemsController < ApplicationController
|
|
24
24
|
def show
|
25
25
|
respond_to do |format|
|
26
26
|
format.html # show.html.erb
|
27
|
-
format.json { render :
|
27
|
+
format.json { render json: @checked_item }
|
28
28
|
end
|
29
29
|
end
|
30
30
|
|
@@ -40,7 +40,7 @@ class CheckedItemsController < ApplicationController
|
|
40
40
|
|
41
41
|
respond_to do |format|
|
42
42
|
format.html # new.html.erb
|
43
|
-
format.json { render :
|
43
|
+
format.json { render json: @checked_item }
|
44
44
|
end
|
45
45
|
end
|
46
46
|
|
@@ -64,14 +64,14 @@ class CheckedItemsController < ApplicationController
|
|
64
64
|
if @checked_item.item.include_supplements
|
65
65
|
flash[:message] << t('item.this_item_include_supplement')
|
66
66
|
end
|
67
|
-
format.html { redirect_to(basket_checked_items_url(@basket), :
|
68
|
-
format.json { render :
|
69
|
-
format.js { redirect_to(basket_checked_items_url(@basket, :
|
67
|
+
format.html { redirect_to(basket_checked_items_url(@basket), notice: t('controller.successfully_created', model: t('activerecord.models.checked_item'))) }
|
68
|
+
format.json { render json: @checked_item, status: :created, location: @checked_item }
|
69
|
+
format.js { redirect_to(basket_checked_items_url(@basket, format: :js)) }
|
70
70
|
else
|
71
71
|
@checked_items = @basket.checked_items.order('created_at DESC').page(1)
|
72
|
-
format.html { render :
|
73
|
-
format.json { render :
|
74
|
-
format.js { render :
|
72
|
+
format.html { render action: "index" }
|
73
|
+
format.json { render json: @checked_item.errors, status: :unprocessable_entity }
|
74
|
+
format.js { render action: "index" }
|
75
75
|
end
|
76
76
|
end
|
77
77
|
end
|
@@ -88,11 +88,11 @@ class CheckedItemsController < ApplicationController
|
|
88
88
|
|
89
89
|
respond_to do |format|
|
90
90
|
if @checked_item.update_attributes(params[:checked_item])
|
91
|
-
format.html { redirect_to @checked_item, :
|
91
|
+
format.html { redirect_to @checked_item, notice: t('controller.successfully_updated', model: t('activerecord.models.checked_item')) }
|
92
92
|
format.json { head :no_content }
|
93
93
|
else
|
94
|
-
format.html { render :
|
95
|
-
format.json { render :
|
94
|
+
format.html { render action: "edit" }
|
95
|
+
format.json { render json: @checked_item.errors, status: :unprocessable_entity }
|
96
96
|
end
|
97
97
|
end
|
98
98
|
end
|
@@ -1,8 +1,7 @@
|
|
1
1
|
class CheckinsController < ApplicationController
|
2
|
-
load_and_authorize_resource :
|
3
|
-
authorize_resource :
|
4
|
-
before_filter :get_basket, :
|
5
|
-
cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
|
2
|
+
load_and_authorize_resource except: :index
|
3
|
+
authorize_resource only: :index
|
4
|
+
before_filter :get_basket, only: [:index, :create]
|
6
5
|
|
7
6
|
# GET /checkins
|
8
7
|
# GET /checkins.json
|
@@ -15,7 +14,7 @@ class CheckinsController < ApplicationController
|
|
15
14
|
|
16
15
|
respond_to do |format|
|
17
16
|
format.html # index.html.erb
|
18
|
-
format.json { render :
|
17
|
+
format.json { render json: @checkins }
|
19
18
|
format.js
|
20
19
|
end
|
21
20
|
end
|
@@ -27,7 +26,7 @@ class CheckinsController < ApplicationController
|
|
27
26
|
|
28
27
|
respond_to do |format|
|
29
28
|
format.html # show.html.erb
|
30
|
-
format.json { render :
|
29
|
+
format.json { render json: @checkin }
|
31
30
|
end
|
32
31
|
end
|
33
32
|
|
@@ -47,7 +46,7 @@ class CheckinsController < ApplicationController
|
|
47
46
|
|
48
47
|
respond_to do |format|
|
49
48
|
format.html # new.html.erb
|
50
|
-
format.json { render :
|
49
|
+
format.json { render json: @checkin }
|
51
50
|
end
|
52
51
|
end
|
53
52
|
|
@@ -77,13 +76,13 @@ class CheckinsController < ApplicationController
|
|
77
76
|
end
|
78
77
|
flash[:message] << message if message
|
79
78
|
format.html { redirect_to basket_checkins_url(@checkin.basket) }
|
80
|
-
format.json { render :
|
81
|
-
format.js { redirect_to basket_checkins_url(@basket, :
|
79
|
+
format.json { render json: @checkin, status: :created, location: @checkin }
|
80
|
+
format.js { redirect_to basket_checkins_url(@basket, format: :js) }
|
82
81
|
else
|
83
82
|
@checkins = @basket.checkins.page(1)
|
84
|
-
format.html { render :
|
85
|
-
format.json { render :
|
86
|
-
format.js { render :
|
83
|
+
format.html { render action: "new" }
|
84
|
+
format.json { render json: @checkin.errors, status: :unprocessable_entity }
|
85
|
+
format.js { render action: "index" }
|
87
86
|
end
|
88
87
|
end
|
89
88
|
end
|
@@ -96,11 +95,11 @@ class CheckinsController < ApplicationController
|
|
96
95
|
|
97
96
|
respond_to do |format|
|
98
97
|
if @checkin.save
|
99
|
-
format.html { redirect_to @checkin, :
|
98
|
+
format.html { redirect_to @checkin, notice: t('controller.successfully_updated', model: t('activerecord.models.checkin')) }
|
100
99
|
format.json { head :no_content }
|
101
100
|
else
|
102
|
-
format.html { render :
|
103
|
-
format.json { render :
|
101
|
+
format.html { render action: "edit" }
|
102
|
+
format.json { render json: @checkin.errors, status: :unprocessable_entity }
|
104
103
|
end
|
105
104
|
end
|
106
105
|
end
|
@@ -13,7 +13,7 @@ class CheckoutTypesController < ApplicationController
|
|
13
13
|
|
14
14
|
respond_to do |format|
|
15
15
|
format.html # index.html.erb
|
16
|
-
format.json { render :
|
16
|
+
format.json { render json: @checkout_types }
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
@@ -26,7 +26,7 @@ class CheckoutTypesController < ApplicationController
|
|
26
26
|
|
27
27
|
respond_to do |format|
|
28
28
|
format.html # show.html.erb
|
29
|
-
format.json { render :
|
29
|
+
format.json { render json: @checkout_type }
|
30
30
|
end
|
31
31
|
end
|
32
32
|
|
@@ -41,7 +41,7 @@ class CheckoutTypesController < ApplicationController
|
|
41
41
|
|
42
42
|
respond_to do |format|
|
43
43
|
format.html # new.html.erb
|
44
|
-
format.json { render :
|
44
|
+
format.json { render json: @checkout_type }
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
@@ -63,11 +63,11 @@ class CheckoutTypesController < ApplicationController
|
|
63
63
|
|
64
64
|
respond_to do |format|
|
65
65
|
if @checkout_type.save
|
66
|
-
format.html { redirect_to @checkout_type, :
|
67
|
-
format.json { render :
|
66
|
+
format.html { redirect_to @checkout_type, notice: t('controller.successfully_created', model: t('activerecord.models.checkout_type')) }
|
67
|
+
format.json { render json: @checkout_type, status: :created, location: @checkout_type }
|
68
68
|
else
|
69
|
-
format.html { render :
|
70
|
-
format.json { render :
|
69
|
+
format.html { render action: "new" }
|
70
|
+
format.json { render json: @checkout_type.errors, status: :unprocessable_entity }
|
71
71
|
end
|
72
72
|
end
|
73
73
|
end
|
@@ -86,11 +86,11 @@ class CheckoutTypesController < ApplicationController
|
|
86
86
|
|
87
87
|
respond_to do |format|
|
88
88
|
if @checkout_type.update_attributes(params[:checkout_type])
|
89
|
-
format.html { redirect_to @checkout_type, :
|
89
|
+
format.html { redirect_to @checkout_type, notice: t('controller.successfully_updated', model: t('activerecord.models.checkout_type')) }
|
90
90
|
format.json { head :no_content }
|
91
91
|
else
|
92
|
-
format.html { render :
|
93
|
-
format.json { render :
|
92
|
+
format.html { render action: "edit" }
|
93
|
+
format.json { render json: @checkout_type.errors, status: :unprocessable_entity }
|
94
94
|
end
|
95
95
|
end
|
96
96
|
end
|
@@ -1,17 +1,16 @@
|
|
1
1
|
class CheckoutsController < ApplicationController
|
2
|
-
before_filter :store_location, :
|
3
|
-
load_and_authorize_resource :
|
4
|
-
authorize_resource :
|
5
|
-
before_filter :get_user, :
|
6
|
-
before_filter :get_item, :
|
7
|
-
after_filter :convert_charset, :
|
8
|
-
cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
|
2
|
+
before_filter :store_location, only: :index
|
3
|
+
load_and_authorize_resource except: [:index, :remove_all]
|
4
|
+
authorize_resource only: [:index, :remove_all]
|
5
|
+
before_filter :get_user, only: [:index, :remove_all]
|
6
|
+
before_filter :get_item, only: :index
|
7
|
+
after_filter :convert_charset, only: :index
|
9
8
|
|
10
9
|
# GET /checkouts
|
11
10
|
# GET /checkouts.json
|
12
11
|
def index
|
13
12
|
if params[:icalendar_token].present?
|
14
|
-
icalendar_user =
|
13
|
+
icalendar_user = Profile.where(:checkout_icalendar_token => params[:icalendar_token]).first.try(:user)
|
15
14
|
if icalendar_user.blank?
|
16
15
|
raise ActiveRecord::RecordNotFound
|
17
16
|
else
|
@@ -23,7 +22,7 @@ class CheckoutsController < ApplicationController
|
|
23
22
|
end
|
24
23
|
end
|
25
24
|
|
26
|
-
if params[:format] == '
|
25
|
+
if params[:format] == 'txt'
|
27
26
|
per_page = 65534
|
28
27
|
else
|
29
28
|
per_page = Checkout.default_per_page
|
@@ -40,7 +39,7 @@ class CheckoutsController < ApplicationController
|
|
40
39
|
end
|
41
40
|
else
|
42
41
|
if current_user == user
|
43
|
-
redirect_to checkouts_url(:
|
42
|
+
redirect_to checkouts_url(format: params[:format])
|
44
43
|
return
|
45
44
|
else
|
46
45
|
access_denied
|
@@ -109,10 +108,10 @@ class CheckoutsController < ApplicationController
|
|
109
108
|
|
110
109
|
respond_to do |format|
|
111
110
|
format.html # index.html.erb
|
112
|
-
format.json { render :
|
113
|
-
format.rss { render :
|
111
|
+
format.json { render json: @checkouts }
|
112
|
+
format.rss { render layout: false }
|
114
113
|
format.ics
|
115
|
-
format.
|
114
|
+
format.txt
|
116
115
|
format.atom
|
117
116
|
end
|
118
117
|
end
|
@@ -122,7 +121,7 @@ class CheckoutsController < ApplicationController
|
|
122
121
|
def show
|
123
122
|
respond_to do |format|
|
124
123
|
format.html # show.html.erb
|
125
|
-
format.json { render :
|
124
|
+
format.json { render json: @checkout }
|
126
125
|
end
|
127
126
|
end
|
128
127
|
|
@@ -140,11 +139,11 @@ class CheckoutsController < ApplicationController
|
|
140
139
|
|
141
140
|
respond_to do |format|
|
142
141
|
if @checkout.save
|
143
|
-
format.html { redirect_to @checkout, :
|
142
|
+
format.html { redirect_to @checkout, notice: t('controller.successfully_updated', model: t('activerecord.models.checkout')) }
|
144
143
|
format.json { head :no_content }
|
145
144
|
else
|
146
|
-
format.html { render :
|
147
|
-
format.json { render :
|
145
|
+
format.html { render action: "edit" }
|
146
|
+
format.json { render json: @checkout.errors, status: :unprocessable_entity }
|
148
147
|
end
|
149
148
|
end
|
150
149
|
end
|
@@ -158,7 +157,7 @@ class CheckoutsController < ApplicationController
|
|
158
157
|
@checkout.save!
|
159
158
|
|
160
159
|
respond_to do |format|
|
161
|
-
format.html { redirect_to
|
160
|
+
format.html { redirect_to checkouts_url(user_id: user.username), notice: t('controller.successfully_deleted', model: t('activerecord.models.checkout')) }
|
162
161
|
format.json { head :no_content }
|
163
162
|
end
|
164
163
|
end
|
@@ -174,7 +173,7 @@ class CheckoutsController < ApplicationController
|
|
174
173
|
end
|
175
174
|
|
176
175
|
respond_to do |format|
|
177
|
-
format.html { redirect_to checkouts_url, :
|
176
|
+
format.html { redirect_to checkouts_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.checkout')) }
|
178
177
|
format.json { head :no_content }
|
179
178
|
end
|
180
179
|
end
|
@@ -13,7 +13,7 @@ class ItemHasUseRestrictionsController < ApplicationController
|
|
13
13
|
|
14
14
|
respond_to do |format|
|
15
15
|
format.html # index.html.erb
|
16
|
-
format.json { render :
|
16
|
+
format.json { render json: @item_has_use_restrictions }
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
@@ -22,7 +22,7 @@ class ItemHasUseRestrictionsController < ApplicationController
|
|
22
22
|
def show
|
23
23
|
respond_to do |format|
|
24
24
|
format.html # show.html.erb
|
25
|
-
format.json { render :
|
25
|
+
format.json { render json: @item_has_use_restriction }
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
@@ -33,7 +33,7 @@ class ItemHasUseRestrictionsController < ApplicationController
|
|
33
33
|
|
34
34
|
respond_to do |format|
|
35
35
|
format.html # new.html.erb
|
36
|
-
format.json { render :
|
36
|
+
format.json { render json: @item_has_use_restriction }
|
37
37
|
end
|
38
38
|
end
|
39
39
|
|
@@ -50,12 +50,12 @@ class ItemHasUseRestrictionsController < ApplicationController
|
|
50
50
|
|
51
51
|
respond_to do |format|
|
52
52
|
if @item_has_use_restriction.save
|
53
|
-
format.html { redirect_to @item_has_use_restriction, :
|
54
|
-
format.json { render :
|
53
|
+
format.html { redirect_to @item_has_use_restriction, notice: t('controller.successfully_created', model: t('activerecord.models.item_has_use_restriction')) }
|
54
|
+
format.json { render json: @item_has_use_restriction, status: :created, location: @item_has_use_restriction }
|
55
55
|
else
|
56
56
|
@use_restrictions = UseRestriction.all
|
57
|
-
format.html { render :
|
58
|
-
format.json { render :
|
57
|
+
format.html { render action: "new" }
|
58
|
+
format.json { render json: @item_has_use_restriction.errors, status: :unprocessable_entity }
|
59
59
|
end
|
60
60
|
end
|
61
61
|
end
|
@@ -66,12 +66,12 @@ class ItemHasUseRestrictionsController < ApplicationController
|
|
66
66
|
@item_has_use_restriction.assign_attributes(params[:item_has_use_restriction])
|
67
67
|
respond_to do |format|
|
68
68
|
if @item_has_use_restriction.save
|
69
|
-
format.html { redirect_to @item_has_use_restriction, :
|
69
|
+
format.html { redirect_to @item_has_use_restriction, notice: t('controller.successfully_updated', model: t('activerecord.models.item_has_use_restriction')) }
|
70
70
|
format.json { head :no_content }
|
71
71
|
else
|
72
72
|
@use_restrictions = UseRestriction.all
|
73
|
-
format.html { render :
|
74
|
-
format.json { render :
|
73
|
+
format.html { render action: "edit" }
|
74
|
+
format.json { render json: @item_has_use_restriction.errors, status: :unprocessable_entity }
|
75
75
|
end
|
76
76
|
end
|
77
77
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
class LendingPoliciesController < InheritedResources::Base
|
2
2
|
load_and_authorize_resource
|
3
3
|
before_filter :get_user_group, :get_item
|
4
|
-
before_filter :prepare_options, :
|
4
|
+
before_filter :prepare_options, only: [:edit, :update]
|
5
5
|
|
6
6
|
def index
|
7
7
|
@lending_policies = LendingPolicy.page(params[:page])
|
@@ -1,6 +1,6 @@
|
|
1
1
|
class ManifestationCheckoutStatsController < ApplicationController
|
2
2
|
load_and_authorize_resource
|
3
|
-
after_filter :convert_charset, :
|
3
|
+
after_filter :convert_charset, only: :show
|
4
4
|
|
5
5
|
# GET /manifestation_checkout_stats
|
6
6
|
# GET /manifestation_checkout_stats.json
|
@@ -9,14 +9,14 @@ class ManifestationCheckoutStatsController < ApplicationController
|
|
9
9
|
|
10
10
|
respond_to do |format|
|
11
11
|
format.html # index.html.erb
|
12
|
-
format.json { render :
|
12
|
+
format.json { render json: @manifestation_checkout_stats }
|
13
13
|
end
|
14
14
|
end
|
15
15
|
|
16
16
|
# GET /manifestation_checkout_stats/1
|
17
17
|
# GET /manifestation_checkout_stats/1.json
|
18
18
|
def show
|
19
|
-
if params[:format] == '
|
19
|
+
if params[:format] == 'txt'
|
20
20
|
per_page = 65534
|
21
21
|
else
|
22
22
|
per_page = CheckoutStatHasManifestation.default_per_page
|
@@ -25,8 +25,8 @@ class ManifestationCheckoutStatsController < ApplicationController
|
|
25
25
|
|
26
26
|
respond_to do |format|
|
27
27
|
format.html # show.html.erb
|
28
|
-
format.json { render :
|
29
|
-
format.
|
28
|
+
format.json { render json: @manifestation_checkout_stat }
|
29
|
+
format.txt
|
30
30
|
end
|
31
31
|
end
|
32
32
|
|
@@ -37,7 +37,7 @@ class ManifestationCheckoutStatsController < ApplicationController
|
|
37
37
|
|
38
38
|
respond_to do |format|
|
39
39
|
format.html # new.html.erb
|
40
|
-
format.json { render :
|
40
|
+
format.json { render json: @manifestation_checkout_stat }
|
41
41
|
end
|
42
42
|
end
|
43
43
|
|
@@ -49,14 +49,16 @@ class ManifestationCheckoutStatsController < ApplicationController
|
|
49
49
|
# POST /manifestation_checkout_stats.json
|
50
50
|
def create
|
51
51
|
@manifestation_checkout_stat = ManifestationCheckoutStat.new(params[:manifestation_checkout_stat])
|
52
|
+
@manifestation_checkout_stat.user = current_user
|
52
53
|
|
53
54
|
respond_to do |format|
|
54
55
|
if @manifestation_checkout_stat.save
|
55
|
-
|
56
|
-
format.
|
56
|
+
Resque.enqueue(ManifestationCheckoutStatQueue, @manifestation_checkout_stat.id)
|
57
|
+
format.html { redirect_to @manifestation_checkout_stat, notice: t('statistic.successfully_created', model: t('activerecord.models.manifestation_checkout_stat')) }
|
58
|
+
format.json { render json: @manifestation_checkout_stat, status: :created, location: @manifestation_checkout_stat }
|
57
59
|
else
|
58
|
-
format.html { render :
|
59
|
-
format.json { render :
|
60
|
+
format.html { render action: "new" }
|
61
|
+
format.json { render json: @manifestation_checkout_stat.errors, status: :unprocessable_entity }
|
60
62
|
end
|
61
63
|
end
|
62
64
|
end
|
@@ -69,11 +71,11 @@ class ManifestationCheckoutStatsController < ApplicationController
|
|
69
71
|
if @manifestation_checkout_stat.mode == 'import'
|
70
72
|
Resque.enqueue(ManifestationCheckoutStatQueue, @manifestation_checkout_stat.id)
|
71
73
|
end
|
72
|
-
format.html { redirect_to @manifestation_checkout_stat, :
|
74
|
+
format.html { redirect_to @manifestation_checkout_stat, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation_checkout_stat')) }
|
73
75
|
format.json { head :no_content }
|
74
76
|
else
|
75
|
-
format.html { render :
|
76
|
-
format.json { render :
|
77
|
+
format.html { render action: "edit" }
|
78
|
+
format.json { render json: @manifestation_checkout_stat.errors, status: :unprocessable_entity }
|
77
79
|
end
|
78
80
|
end
|
79
81
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
class ManifestationReserveStatsController < ApplicationController
|
2
2
|
load_and_authorize_resource
|
3
|
-
after_filter :convert_charset, :
|
3
|
+
after_filter :convert_charset, only: :show
|
4
4
|
|
5
5
|
# GET /manifestation_reserve_stats
|
6
6
|
# GET /manifestation_reserve_stats.json
|
@@ -9,14 +9,14 @@ class ManifestationReserveStatsController < ApplicationController
|
|
9
9
|
|
10
10
|
respond_to do |format|
|
11
11
|
format.html # index.html.erb
|
12
|
-
format.json { render :
|
12
|
+
format.json { render json: @manifestation_reserve_stats }
|
13
13
|
end
|
14
14
|
end
|
15
15
|
|
16
16
|
# GET /manifestation_reserve_stats/1
|
17
17
|
# GET /manifestation_reserve_stats/1.json
|
18
18
|
def show
|
19
|
-
if params[:format] == '
|
19
|
+
if params[:format] == 'txt'
|
20
20
|
per_page = 65534
|
21
21
|
else
|
22
22
|
per_page = ReserveStatHasManifestation.default_per_page
|
@@ -25,8 +25,8 @@ class ManifestationReserveStatsController < ApplicationController
|
|
25
25
|
|
26
26
|
respond_to do |format|
|
27
27
|
format.html # show.html.erb
|
28
|
-
format.json { render :
|
29
|
-
format.
|
28
|
+
format.json { render json: @manifestation_reserve_stat }
|
29
|
+
format.txt
|
30
30
|
end
|
31
31
|
end
|
32
32
|
|
@@ -37,7 +37,7 @@ class ManifestationReserveStatsController < ApplicationController
|
|
37
37
|
|
38
38
|
respond_to do |format|
|
39
39
|
format.html # new.html.erb
|
40
|
-
format.json { render :
|
40
|
+
format.json { render json: @manifestation_reserve_stat }
|
41
41
|
end
|
42
42
|
end
|
43
43
|
|
@@ -49,14 +49,16 @@ class ManifestationReserveStatsController < ApplicationController
|
|
49
49
|
# POST /manifestation_reserve_stats.json
|
50
50
|
def create
|
51
51
|
@manifestation_reserve_stat = ManifestationReserveStat.new(params[:manifestation_reserve_stat])
|
52
|
+
@manifestation_reserve_stat.user = current_user
|
52
53
|
|
53
54
|
respond_to do |format|
|
54
55
|
if @manifestation_reserve_stat.save
|
55
|
-
|
56
|
-
format.
|
56
|
+
Resque.enqueue(ManifestationReserveStatQueue, @manifestation_reserve_stat.id)
|
57
|
+
format.html { redirect_to @manifestation_reserve_stat, notice: t('statistic.successfully_created', model: t('activerecord.models.manifestation_reserve_stat')) }
|
58
|
+
format.json { render json: @manifestation_reserve_stat, status: :created, location: @manifestation_reserve_stat }
|
57
59
|
else
|
58
|
-
format.html { render :
|
59
|
-
format.json { render :
|
60
|
+
format.html { render action: "new" }
|
61
|
+
format.json { render json: @manifestation_reserve_stat.errors, status: :unprocessable_entity }
|
60
62
|
end
|
61
63
|
end
|
62
64
|
end
|
@@ -69,11 +71,11 @@ class ManifestationReserveStatsController < ApplicationController
|
|
69
71
|
if @manifestation_reserve_stat.mode == 'import'
|
70
72
|
Resque.enqueue(ManifestationReserveStatQueue, @manifestation_reserve_stat.id)
|
71
73
|
end
|
72
|
-
format.html { redirect_to @manifestation_reserve_stat, :
|
74
|
+
format.html { redirect_to @manifestation_reserve_stat, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_reserve_stat')) }
|
73
75
|
format.json { head :no_content }
|
74
76
|
else
|
75
|
-
format.html { render :
|
76
|
-
format.json { render :
|
77
|
+
format.html { render action: "edit" }
|
78
|
+
format.json { render json: @manifestation_reserve_stat.errors, status: :unprocessable_entity }
|
77
79
|
end
|
78
80
|
end
|
79
81
|
end
|