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
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.listing', :
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.checkout')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<p id="notice"><%= notice %></p>
|
5
5
|
<%= render 'list' -%>
|
@@ -22,39 +22,39 @@
|
|
22
22
|
</ul>
|
23
23
|
<%= render 'reserved_facet' %>
|
24
24
|
<ul>
|
25
|
-
<li><%= link_to t('activerecord.models.reserve'),
|
25
|
+
<li><%= link_to t('activerecord.models.reserve'), reserves_path(user_id: user.username) -%></li>
|
26
26
|
<%- if current_user.has_role?('Librarian') -%>
|
27
27
|
<li><%= link_to t('checkout.all_checkout'), checkouts_path -%></li>
|
28
28
|
<%- end -%>
|
29
29
|
<% if current_user.checkout_icalendar_token? %>
|
30
30
|
<li>
|
31
|
-
<%= link_to 'iCalendar', checkouts_path(:
|
32
|
-
<%= link_to (image_tag 'icons/date.png', :
|
31
|
+
<%= link_to 'iCalendar', checkouts_path(icalendar_token: user.checkout_icalendar_token, format: :ics) -%>
|
32
|
+
<%= link_to (image_tag 'icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_path(user_id: user.username, format: :ics) -%>
|
33
33
|
</li>
|
34
34
|
<% end %>
|
35
35
|
<%- if params[:view] == 'overdue' -%>
|
36
36
|
<li>
|
37
|
-
<%= link_to 'RSS',
|
38
|
-
<%= link_to (image_tag 'icons/feed.png', :
|
37
|
+
<%= link_to 'RSS', checkouts_path(user_id: user.username, format: :rss, view: 'overdue') -%>
|
38
|
+
<%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: user.username, format: :rss, view: 'overdue') -%>
|
39
39
|
</li>
|
40
40
|
<li>
|
41
|
-
<%= link_to '
|
42
|
-
<%= link_to (image_tag 'icons/page_white_excel.png', :
|
41
|
+
<%= link_to 'TSV', checkouts_path(user_id: user.username, format: :txt, view: 'overdue', locale: @locale.to_s) -%>
|
42
|
+
<%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: user.username, format: :txt, view: 'overdue', locale: @locale.to_s) -%>
|
43
43
|
</li>
|
44
44
|
<%- else -%>
|
45
45
|
<li>
|
46
|
-
<%= link_to 'RSS',
|
47
|
-
<%= link_to (image_tag 'icons/feed.png', :
|
46
|
+
<%= link_to 'RSS', checkouts_path(user_id: user.username, format: :rss) -%>
|
47
|
+
<%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: user.username, format: :rss) -%>
|
48
48
|
</li>
|
49
49
|
<li>
|
50
|
-
<%= link_to '
|
51
|
-
<%= link_to (image_tag 'icons/page_white_excel.png', :
|
50
|
+
<%= link_to 'TSV', checkouts_path(user_id: user.username, format: :txt, locale: @locale.to_s) -%>
|
51
|
+
<%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: user.username, format: :txt, locale: @locale.to_s) -%>
|
52
52
|
</li>
|
53
53
|
<%- end -%>
|
54
54
|
</ul>
|
55
55
|
<ul>
|
56
56
|
<% if @user == current_user %>
|
57
|
-
<li><%= link_to t('checkout.remove_all_history'), remove_all_user_checkouts_path(current_user), :
|
57
|
+
<li><%= link_to t('checkout.remove_all_history'), remove_all_user_checkouts_path(current_user), method: :put, data: {confirm: t('page.are_you_sure')} %></li>
|
58
58
|
<% end %>
|
59
59
|
</ul>
|
60
60
|
</div>
|
@@ -11,19 +11,19 @@
|
|
11
11
|
<tr class="line<%= cycle("0", "1") -%>">
|
12
12
|
<td>
|
13
13
|
<% if checkout.user %>
|
14
|
-
<%= link_to checkout.user_username, checkout.user %>
|
14
|
+
<%= link_to checkout.user_username, checkout.user.profile %>
|
15
15
|
<br />
|
16
|
-
(<%= link_to checkout.
|
16
|
+
(<%= link_to checkout.user.profile.user_number, checkout.user.profile %>)
|
17
17
|
<% end %>
|
18
18
|
</td>
|
19
19
|
<td>
|
20
20
|
<% if checkout.item %>
|
21
|
-
<%= render 'manifestations/show_index', :
|
21
|
+
<%= render 'manifestations/show_index', manifestation: checkout.item.manifestation -%>
|
22
22
|
(<%= link_to checkout.item.item_identifier, checkout.item -%>)
|
23
23
|
<% end %>
|
24
24
|
</td>
|
25
25
|
<td>
|
26
|
-
<%= l(checkout.due_date, :
|
26
|
+
<%= l(checkout.due_date, format: :only_date) -%>
|
27
27
|
<br />
|
28
28
|
<% if checkout.checkin %>
|
29
29
|
<strong><%= t('checkout.returned') %></strong>
|
@@ -36,7 +36,7 @@
|
|
36
36
|
<% end %>
|
37
37
|
<%- end -%>
|
38
38
|
<%- if can? :delete, checkout -%>
|
39
|
-
<%= link_to t('page.destroy'), checkout, :
|
39
|
+
<%= link_to t('page.destroy'), checkout, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
|
40
40
|
<%- end -%>
|
41
41
|
</td>
|
42
42
|
</tr>
|
@@ -4,11 +4,11 @@
|
|
4
4
|
<% facet.value ? facet_reserved = true : facet_reserved = false %>
|
5
5
|
<li>
|
6
6
|
<%- if @reserved == facet_reserved -%><strong><%- end -%>
|
7
|
-
<%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(:
|
7
|
+
<%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(page: nil, reserved: facet.value.to_s, view: nil, only_path: true)) -%>
|
8
8
|
<%- if @reserved == facet_reserved -%></strong><%- end -%>
|
9
9
|
</li>
|
10
10
|
<%- end -%>
|
11
11
|
<%- unless @reserved.nil? -%>
|
12
|
-
<li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:
|
12
|
+
<li><%= link_to t('page.remove_this_facet'), url_for(params.merge(reserved: nil, page: nil, view: nil, only_path: true)) -%></li>
|
13
13
|
<%- end -%>
|
14
14
|
</ul>
|
@@ -1,14 +1,14 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.editing', :
|
2
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.checkout')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
|
5
|
-
<%= render 'manifestations/title', :
|
5
|
+
<%= render 'manifestations/title', manifestation: @checkout.item.manifestation if @checkout.item -%>
|
6
6
|
|
7
7
|
<h3><%= t('checkout.renewal') -%></h3>
|
8
8
|
<%- if @checkout.renewable? -%>
|
9
9
|
<%= form_for(@checkout) do |f| -%>
|
10
|
-
<%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :
|
11
|
-
<%= f.hidden_field :due_date, :
|
10
|
+
<%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, format: :only_date) if @new_due_date -%>
|
11
|
+
<%= f.hidden_field :due_date, value: @new_due_date -%>
|
12
12
|
<br />
|
13
13
|
<%= f.submit %>
|
14
14
|
<%- end -%>
|
@@ -26,10 +26,10 @@
|
|
26
26
|
<%= f.label :due_date -%>
|
27
27
|
<%= f.hidden_field :user_id -%>
|
28
28
|
<%= f.hidden_field :item_id -%>
|
29
|
-
<%= f.text_field :due_date, :
|
29
|
+
<%= f.text_field :due_date, value: @checkout.due_date.try(:strftime, "%Y-%m-%d"), class: 'date_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
|
30
30
|
</div>
|
31
31
|
<div class="field">
|
32
|
-
<%= t('checkout.renewal_count') -%>: <%= f.text_field :checkout_renewal_count, :
|
32
|
+
<%= t('checkout.renewal_count') -%>: <%= f.text_field :checkout_renewal_count, class: 'resource_integer' -%>
|
33
33
|
</div>
|
34
34
|
|
35
35
|
<div class="actions">
|
@@ -41,11 +41,11 @@
|
|
41
41
|
</div>
|
42
42
|
|
43
43
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
44
|
-
<%= render 'manifestations/book_jacket', :
|
44
|
+
<%= render 'manifestations/book_jacket', manifestation: @checkout.item.manifestation if @checkout.item -%>
|
45
45
|
<ul>
|
46
46
|
<li><%= link_to t('page.show'), @checkout -%></li>
|
47
47
|
<% if @checkout.user %>
|
48
|
-
<li><%= link_to t('page.back'),
|
48
|
+
<li><%= link_to t('page.back'), checkouts_path(user_id: @checkout.user.username) -%></li>
|
49
49
|
<% end %>
|
50
50
|
</ul>
|
51
51
|
</div>
|
@@ -1,8 +1,8 @@
|
|
1
|
-
atom_feed(:
|
1
|
+
atom_feed(url: checkouts_url(format: :atom)) do |feed|
|
2
2
|
if @user
|
3
|
-
feed.title t('checkout.user_checkout', :
|
3
|
+
feed.title t('checkout.user_checkout', login_name: @user.username)
|
4
4
|
else
|
5
|
-
feed.title t('checkout.library_group_checkout', :
|
5
|
+
feed.title t('checkout.library_group_checkout', library_group_name: @library_group.display_name.localize)
|
6
6
|
end
|
7
7
|
feed.updated(@checkouts.first ? @checkouts.first.created_at : Time.zone.now)
|
8
8
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<%- if current_user.has_role?('Librarian') -%>
|
2
2
|
<%- if @user -%>
|
3
|
-
<%= render 'index_user', :
|
3
|
+
<%= render 'index_user', user: @user -%>
|
4
4
|
<% elsif @item %>
|
5
|
-
<%= render 'index_item', :
|
5
|
+
<%= render 'index_item', item: @item -%>
|
6
6
|
<% else %>
|
7
7
|
<%- if params[:view] == 'overdue' -%>
|
8
8
|
<%= render 'index_overdue' -%>
|
@@ -14,6 +14,6 @@
|
|
14
14
|
<%- if params[:view] == 'overdue' -%>
|
15
15
|
<%= render 'index_overdue' -%>
|
16
16
|
<%- else -%>
|
17
|
-
<%= render 'index_user', :
|
17
|
+
<%= render 'index_user', user: current_user -%>
|
18
18
|
<%- end -%>
|
19
19
|
<%- end -%>
|
@@ -4,20 +4,20 @@ xml.rss('version' => "2.0",
|
|
4
4
|
'xmlns:atom' => "http://www.w3.org/2005/Atom"){
|
5
5
|
xml.channel{
|
6
6
|
if @user
|
7
|
-
xml.title t('checkout.user_checkout', :
|
8
|
-
xml.link
|
9
|
-
xml.tag! "atom:link", :
|
10
|
-
xml.tag! "atom:link", :
|
7
|
+
xml.title t('checkout.user_checkout', login_name: @user.username)
|
8
|
+
xml.link checkouts_url(user_id: @user.username)
|
9
|
+
xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
|
10
|
+
xml.tag! "atom:link", rel: 'alternate', href: checkouts_url(user_id: @user.username)
|
11
11
|
else
|
12
|
-
xml.title t('checkout.library_group_checkout', :
|
12
|
+
xml.title t('checkout.library_group_checkout', library_group_name: @library_group.display_name.localize)
|
13
13
|
xml.link checkouts_url
|
14
|
-
xml.tag! "atom:link", :
|
15
|
-
xml.tag! "atom:link", :
|
14
|
+
xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
|
15
|
+
xml.tag! "atom:link", rel: 'alternate', href: checkouts_url
|
16
16
|
end
|
17
17
|
xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
|
18
18
|
xml.language @locale.to_s
|
19
19
|
xml.ttl "60"
|
20
|
-
#xml.tag! "atom:link", :
|
20
|
+
#xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
|
21
21
|
unless params[:query].blank?
|
22
22
|
xml.tag! "opensearch:totalResults", @count[:query_result]
|
23
23
|
xml.tag! "opensearch:startIndex", @checkouts.offset + 1
|
@@ -31,7 +31,7 @@ xml.rss('version' => "2.0",
|
|
31
31
|
# rfc822
|
32
32
|
xml.pubDate checkout.created_at.utc.rfc822
|
33
33
|
xml.link checkout_url(checkout)
|
34
|
-
xml.guid checkout_url(checkout), :
|
34
|
+
xml.guid checkout_url(checkout), isPermaLink: "true"
|
35
35
|
end
|
36
36
|
end
|
37
37
|
}
|
@@ -0,0 +1,4 @@
|
|
1
|
+
<%- if params[:view] == 'overdue' -%><%= 'Overdue items' -%><%- else -%><%= 'Checkout items' -%><%- end -%> (created_at: <%= Time.now -%>)<%= "\n" -%>
|
2
|
+
<%- @checkouts.each do |checkout| -%>
|
3
|
+
"<%=h checkout.user.try(:username) -%>" "<%=h checkout.item.item_identifier -%>" "<%=h checkout.item.manifestation.original_title -%>" "<%=h checkout.created_at -%>" "<%= checkout.due_date -%>"<%= "\n" -%>
|
4
|
+
<%- end -%>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<h1 class="title"><%= t('page.new', :
|
1
|
+
<h1 class="title"><%= t('page.new', model: t('activerecord.models.checkouts')) -%></h1>
|
2
2
|
|
3
3
|
<%= form_for(@checkout) do |f| -%>
|
4
4
|
<%= f.error_messages -%>
|
@@ -17,4 +17,4 @@
|
|
17
17
|
</div>
|
18
18
|
<%- end -%>
|
19
19
|
|
20
|
-
<%= link_to t('page.back'),
|
20
|
+
<%= link_to t('page.back'), checkouts_path(user_id: @user.username) -%>
|
@@ -1,35 +1,35 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.showing', :
|
2
|
+
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.checkout')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<p id="notice"><%= notice %></p>
|
5
5
|
|
6
|
-
<%= render 'manifestations/title', :
|
6
|
+
<%= render 'manifestations/title', manifestation: @checkout.item.manifestation -%>
|
7
7
|
<p>
|
8
8
|
<strong><%= t('activerecord.attributes.item.item_identifier') -%></strong><br />
|
9
9
|
<%= link_to @checkout.item.item_identifier, @checkout.item -%>
|
10
10
|
</p>
|
11
11
|
<p>
|
12
12
|
<strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
|
13
|
-
<%= l(@checkout.due_date, :
|
13
|
+
<%= l(@checkout.due_date, format: :only_date) if @checkout.due_date -%>
|
14
14
|
</p>
|
15
15
|
<%- if can? :update, @checkout -%>
|
16
16
|
<p>
|
17
17
|
<strong><%= t('checkout.current_user') -%></strong><br />
|
18
|
-
<%= link_to @checkout.user_username, @checkout.user if @checkout.user -%>
|
18
|
+
<%= link_to @checkout.user_username, @checkout.user.profile if @checkout.user.try(:profile) -%>
|
19
19
|
</p>
|
20
20
|
<%- end -%>
|
21
21
|
</div>
|
22
22
|
</div>
|
23
23
|
|
24
24
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
25
|
-
<%= render 'manifestations/book_jacket', :
|
25
|
+
<%= render 'manifestations/book_jacket', manifestation: @checkout.item.manifestation -%>
|
26
26
|
<ul>
|
27
27
|
<li><%= link_to t('page.edit'), edit_checkout_path(@checkout) -%></li>
|
28
28
|
<% if @checkout.user %>
|
29
|
-
<li><%= link_to t('page.back'),
|
29
|
+
<li><%= link_to t('page.back'), checkouts_path(user_id: @checkout.user.username) -%></li>
|
30
30
|
<% end %>
|
31
31
|
<%- if current_user.has_role?('Librarian') -%>
|
32
|
-
<li><%= link_to t('page.back_to', :
|
32
|
+
<li><%= link_to t('page.back_to', model: t('activerecord.models.checkout')), checkouts_path -%></li>
|
33
33
|
<%- end -%>
|
34
34
|
</ul>
|
35
35
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.editing', :
|
2
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.circulation_status')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<%= render 'form' %>
|
5
5
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.listing', :
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.circulation_status')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
|
5
5
|
<table class="table table-striped index">
|
@@ -24,7 +24,7 @@
|
|
24
24
|
<%= link_to t('page.edit'), edit_circulation_status_path(circulation_status) -%>
|
25
25
|
<% end %>
|
26
26
|
<%- if can? :delete, circulation_status -%>
|
27
|
-
<%= link_to t('page.destroy'), circulation_status, :
|
27
|
+
<%= link_to t('page.destroy'), circulation_status, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
|
28
28
|
<%- end -%>
|
29
29
|
</td>
|
30
30
|
</tr>
|
@@ -37,7 +37,7 @@
|
|
37
37
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
38
38
|
<ul>
|
39
39
|
<%- if can? :create, CirculationStatus -%>
|
40
|
-
<li><%= link_to t('page.new', :
|
40
|
+
<li><%= link_to t('page.new', model: t('activerecord.models.circulation_status')), new_circulation_status_path -%></li>
|
41
41
|
<%- end -%>
|
42
42
|
</ul>
|
43
43
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.new', :
|
2
|
+
<h1 class="title"><%= t('page.new', model: t('activerecord.models.circulation_status')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<%= render 'form' %>
|
5
5
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.showing', :
|
2
|
+
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.circulation_status')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<p id="notice"><%= notice %></p>
|
5
5
|
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<h1 class="title"><%= t('page.editing', :
|
1
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.item_has_use_restriction')) -%></h1>
|
2
2
|
|
3
3
|
<%= form_for(@item_has_use_restriction) do |f| -%>
|
4
4
|
<%= f.error_messages -%>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<h1 class="title"><%= t('page.listing', :
|
1
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.item_has_use_restriction')) -%></h1>
|
2
2
|
|
3
3
|
<table>
|
4
4
|
<tr>
|
@@ -16,7 +16,7 @@
|
|
16
16
|
<td><%= link_to item_has_use_restriction.use_restriction.display_name.localize, item_has_use_restriction.use_restriction -%></td>
|
17
17
|
<td><%= link_to t('page.show'), item_has_use_restriction -%></td>
|
18
18
|
<td><%= link_to t('page.edit'), edit_item_has_use_restriction_path(item_has_use_restriction) -%></td>
|
19
|
-
<td><%= link_to t('page.destroy'), item_has_use_restriction, :
|
19
|
+
<td><%= link_to t('page.destroy'), item_has_use_restriction, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>
|
20
20
|
</tr>
|
21
21
|
<%- end -%>
|
22
22
|
</table>
|
@@ -25,8 +25,8 @@
|
|
25
25
|
<br />
|
26
26
|
|
27
27
|
<%- if @item -%>
|
28
|
-
<%= link_to t('page.new', :
|
28
|
+
<%= link_to t('page.new', model: t('activerecord.models.item_has_use_restriction')), new_item_item_has_use_restriction_path(@item) -%>
|
29
29
|
<%- else -%>
|
30
|
-
<%= link_to t('page.new', :
|
30
|
+
<%= link_to t('page.new', model: t('activerecord.models.item_has_use_restriction')), new_item_has_use_restriction_path -%>
|
31
31
|
<%- end -%>
|
32
32
|
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<h1 class="title"><%= t('page.new', :
|
1
|
+
<h1 class="title"><%= t('page.new', model: t('activerecord.models.item_has_use_restriction')) -%></h1>
|
2
2
|
|
3
3
|
<%= form_for(@item_has_use_restriction) do |f| -%>
|
4
4
|
<%= f.error_messages -%>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
<%= f.label t('activerecord.models.item') -%><br />
|
7
7
|
<%- if @item -%>
|
8
8
|
<%= link_to @item.item_identifier, @item -%> (<%= link_to @item.manifestation.original_title, @item.manifestation -%>)
|
9
|
-
<%= f.hidden_field :item_id, :
|
9
|
+
<%= f.hidden_field :item_id, value: @item.id -%>
|
10
10
|
<%- else -%>
|
11
11
|
<%= f.text_field :item_id -%>
|
12
12
|
<%- end -%>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.showing', :
|
2
|
+
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.item_has_use_restriction')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<p id="notice"><%= notice %></p>
|
5
5
|
|
@@ -21,7 +21,7 @@
|
|
21
21
|
</div>
|
22
22
|
<div class="field">
|
23
23
|
<%= f.label :fixed_due_date -%><br />
|
24
|
-
<%= f.text_field :fixed_due_date, :
|
24
|
+
<%= f.text_field :fixed_due_date, value: @lending_policy.fixed_due_date.try(:strftime, "%Y-%m-%d"), class: 'date_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
|
25
25
|
</div>
|
26
26
|
<div class="field">
|
27
27
|
<%= f.label :renewal -%><br />
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.editing', :
|
2
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.lending_policy')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<%= render 'form' %>
|
5
5
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.listing', :
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.lending_policy')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
|
5
5
|
<table class="table table-striped index">
|
@@ -27,7 +27,7 @@
|
|
27
27
|
<td>
|
28
28
|
<%= link_to t('page.show'), lending_policy -%>
|
29
29
|
<%= link_to t('page.edit'), edit_lending_policy_path(lending_policy) -%>
|
30
|
-
<%= link_to t('page.destroy'), lending_policy, :
|
30
|
+
<%= link_to t('page.destroy'), lending_policy, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
|
31
31
|
</td>
|
32
32
|
</tr>
|
33
33
|
<%- end -%>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.new', :
|
2
|
+
<h1 class="title"><%= t('page.new', model: t('activerecord.models.lending_policy')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<%= render 'form' %>
|
5
5
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.showing', :
|
2
|
+
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.lending_policy')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<p id="notice"><%= notice %></p>
|
5
5
|
|
@@ -21,7 +21,7 @@
|
|
21
21
|
|
22
22
|
<p>
|
23
23
|
<strong><%= t('activerecord.attributes.lending_policy.fixed_due_date') -%>:</strong>
|
24
|
-
<%= l(@lending_policy.fixed_due_date, :
|
24
|
+
<%= l(@lending_policy.fixed_due_date, format: :only_date) if @lending_policy.fixed_due_date -%>
|
25
25
|
</p>
|
26
26
|
|
27
27
|
<p>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.editing', :
|
2
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.manifestation_checkout_stat')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<%= render 'form' %>
|
5
5
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.listing', :
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.manifestation_checkout_stat')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
|
5
5
|
<table class="table table-striped index">
|
@@ -17,8 +17,7 @@
|
|
17
17
|
<td><%= localized_state(manifestation_checkout_stat.current_state) -%></td>
|
18
18
|
<td>
|
19
19
|
<%= link_to t('page.show'), manifestation_checkout_stat -%>
|
20
|
-
<%= link_to t('page.
|
21
|
-
<%= link_to t('page.destroy'), manifestation_checkout_stat, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
20
|
+
<%= link_to t('page.destroy'), manifestation_checkout_stat, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
|
22
21
|
</td>
|
23
22
|
</tr>
|
24
23
|
<%- end -%>
|
@@ -30,6 +29,6 @@
|
|
30
29
|
|
31
30
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
32
31
|
<ul>
|
33
|
-
<li><%= link_to t('page.new', :
|
32
|
+
<li><%= link_to t('page.new', model: t('activerecord.models.manifestation_checkout_stat')), new_manifestation_checkout_stat_path -%></li>
|
34
33
|
</ul>
|
35
34
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.new', :
|
2
|
+
<h1 class="title"><%= t('page.new', model: t('activerecord.models.manifestation_checkout_stat')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<%= render 'form' %>
|
5
5
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.showing', :
|
2
|
+
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.manifestation_checkout_stat')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<p id="notice"><%= notice %></p>
|
5
5
|
|
@@ -31,7 +31,7 @@
|
|
31
31
|
<%- @stats.each do |stat| -%>
|
32
32
|
<tr class="line<%= cycle("0", "1") -%>">
|
33
33
|
<td>
|
34
|
-
<%= render 'manifestations/show_index', :
|
34
|
+
<%= render 'manifestations/show_index', manifestation: stat.manifestation if stat.manifestation -%>
|
35
35
|
</td>
|
36
36
|
<td><%= stat.checkouts_count -%></td>
|
37
37
|
</tr>
|
@@ -46,12 +46,11 @@
|
|
46
46
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
47
47
|
<%= form_for(@manifestation_checkout_stat) do |f| %>
|
48
48
|
<ul>
|
49
|
-
<li><%= link_to t('page.edit'), edit_manifestation_checkout_stat_path(@manifestation_checkout_stat) -%></li>
|
50
49
|
<li><%= back_to_index(flash[:page_info]) -%></li>
|
51
50
|
</ul>
|
52
51
|
<% end %>
|
53
52
|
<h4><%= t('page.export') -%></h4>
|
54
53
|
<ul>
|
55
|
-
<li><%= link_to '
|
54
|
+
<li><%= link_to 'TSV', manifestation_checkout_stat_path(@manifestation_checkout_stat, format: :txt, locale: @locale.to_s) -%></li>
|
56
55
|
</ul>
|
57
56
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.editing', :
|
2
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.manifestation_reserve_stat')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
<%= render 'form' %>
|
5
5
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div id="content_detail" class="ui-corner-all ui-widget-content">
|
2
|
-
<h1 class="title"><%= t('page.listing', :
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.manifestation_reserve_stat')) -%></h1>
|
3
3
|
<div id="content_list">
|
4
4
|
|
5
5
|
<table class="table table-striped index">
|
@@ -17,8 +17,7 @@
|
|
17
17
|
<td><%= localized_state(manifestation_reserve_stat.current_state) -%></td>
|
18
18
|
<td>
|
19
19
|
<%= link_to t('page.show'), manifestation_reserve_stat -%>
|
20
|
-
<%= link_to t('page.
|
21
|
-
<%= link_to t('page.destroy'), manifestation_reserve_stat, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
20
|
+
<%= link_to t('page.destroy'), manifestation_reserve_stat, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
|
22
21
|
</td>
|
23
22
|
</tr>
|
24
23
|
<%- end -%>
|
@@ -30,6 +29,6 @@
|
|
30
29
|
|
31
30
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
32
31
|
<ul>
|
33
|
-
<li><%= link_to t('page.new', :
|
32
|
+
<li><%= link_to t('page.new', model: t('activerecord.models.manifestation_reserve_stat')), new_manifestation_reserve_stat_path -%></li>
|
34
33
|
</ul>
|
35
34
|
</div>
|