enju_leaf 1.1.0.rc15 → 1.1.0.rc16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +2 -2
- data/app/assets/javascripts/mobile.js +1 -1
- data/app/assets/stylesheets/mobile.css +1 -1
- data/app/controllers/my_accounts_controller.rb +5 -5
- data/app/controllers/page_controller.rb +10 -2
- data/app/models/profile.rb +15 -5
- data/app/models/user_export_file.rb +1 -1
- data/app/models/user_import_file.rb +2 -2
- data/app/views/my_accounts/_edit_credential.html.erb +10 -0
- data/app/views/my_accounts/edit.html.erb +2 -4
- data/app/views/page/_header.html.erb +3 -3
- data/app/views/page/_menu.html.erb +3 -0
- data/app/views/page/configuration.html.erb +3 -0
- data/app/views/page/opensearch.xml.builder +1 -1
- data/app/views/page/system_information.html.erb +23 -0
- data/app/views/profiles/_edit_credential.html.erb +10 -0
- data/app/views/profiles/edit.html.erb +3 -4
- data/app/views/profiles/index.html.erb +4 -4
- data/app/views/profiles/new.html.erb +10 -0
- data/config/locales/translation_en.yml +3 -0
- data/config/locales/translation_ja.yml +3 -0
- data/config/routes.rb +1 -0
- data/db/migrate/20140524074813_create_user_import_file_transitions.rb +5 -1
- data/db/migrate/20140709113905_create_user_export_file_transitions.rb +5 -1
- data/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +5 -0
- data/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +5 -0
- data/lib/enju_leaf/controller.rb +4 -4
- data/lib/enju_leaf/helper.rb +7 -0
- data/lib/enju_leaf/version.rb +1 -1
- data/lib/enju_leaf.rb +0 -48
- data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb +1 -1
- data/lib/generators/enju_leaf/setup/setup_generator.rb +9 -0
- data/lib/generators/enju_leaf/setup/templates/Procfile +1 -1
- data/lib/tasks/enju_leaf_tasks.rake +6 -0
- data/lib/tasks/profile.rb +1 -1
- data/spec/controllers/page_controller_spec.rb +15 -0
- data/spec/dummy/config/database.yml +23 -18
- data/spec/dummy/db/migrate/001_create_agents.rb +0 -2
- data/spec/dummy/db/migrate/005_create_manifestations.rb +1 -2
- data/spec/dummy/db/migrate/006_create_items.rb +0 -2
- data/spec/dummy/db/migrate/035_create_reserves.rb +0 -1
- data/spec/dummy/db/migrate/133_create_agent_merges.rb +15 -0
- data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +13 -0
- data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +0 -1
- data/spec/dummy/db/migrate/20081212151614_create_bookmark_stats.rb +0 -3
- data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +0 -1
- data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +0 -1
- data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +0 -1
- data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +0 -4
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +0 -1
- data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140524135607_create_bookmark_stat_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140529014410_create_item_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +5 -1
- 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/{20140810061942_add_user_id_to_stat.rb → 20140810061942_add_user_id_to_user_checkout_stat.rb} +1 -1
- data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
- data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +6 -0
- data/spec/dummy/db/schema.rb +674 -663
- data/spec/fixtures/agent_import_results.yml +0 -3
- data/spec/fixtures/agents.yml +0 -12
- data/spec/fixtures/checked_items.yml +4 -4
- data/spec/fixtures/checkouts.yml +12 -12
- data/spec/fixtures/manifestation_checkout_stats.yml +0 -3
- data/spec/fixtures/manifestation_reserve_stats.yml +0 -3
- data/spec/fixtures/manifestations.yml +114 -114
- data/spec/fixtures/reserves.yml +17 -17
- data/spec/fixtures/user_checkout_stats.yml +0 -3
- data/spec/fixtures/user_reserve_stats.yml +0 -3
- data/spec/fixtures/users.yml +1 -1
- data/spec/spec_helper.rb +2 -0
- data/vendor/assets/javascripts/{jquery.mobile-1.4.3.js → jquery.mobile-1.4.4.js} +191 -116
- data/vendor/assets/stylesheets/{jquery.mobile-1.4.3.css → jquery.mobile-1.4.4.css} +10 -2
- metadata +79 -264
- data/app/models/local_patron.rb +0 -27
- data/lib/enju_leaf/bookmark_url.rb +0 -45
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/migrate/20111020063828_remove_dsbl_from_library_group.rb +0 -11
- data/spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb +0 -5
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_delete_file.tsv +0 -4
- data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_import_file_sample.tsv +0 -7
- data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_update_file.tsv +0 -4
- data/spec/dummy/private/system/user_import_files/user_imports/980/190/964/original/user_delete_file.tsv +0 -4
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140815-3963-1s1td26.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140815-69229-i0rcty.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140816-21120-1w731r8.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-59118-14fm7df.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-59989-vmovk5.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-75062-kpzjyb.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-75773-1lhgyub.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-75927-j8wteq.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140820-9103-mfcugd.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140822-13160-wz7o56.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140824-39018-fw3fdj.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140828-69043-tbwoqv.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140915-22971-1jmyywh.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140915-23153-j4x3ru.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140915-67244-1uo8pkb.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80298-14af9pc.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80450-1qhv5cf.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80529-1hahtrn.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-80725-tqmhnv.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-81018-wl1hgj.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-81246-wll5s.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-81371-8uz50r.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140922-84122-1u96hw6.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140926-7716-bbs13d.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57000-yu6qop.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57206-2j8sg2.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57328-p8lryh.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141002-57609-1j3dd67.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20141003-78097-dw5i2k.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140711-28652-1dj3e98.txt +0 -148
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140711-29117-13jb6ol.txt +0 -148
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140721-65743-1tnagd4.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140815-3963-1kk8o87.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140815-69229-188nwub.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140816-21120-twzfb6.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-59118-1lhrtka.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-59989-1prz707.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-75062-10bxh78.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-75773-ekgeho.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-75927-uay97k.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140820-9103-tuuox.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140822-13160-17b5dbh.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140824-39018-o12xa4.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140915-22971-d4ul8o.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140915-23153-1qmzqi6.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140915-67244-1ps1qsi.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80298-121rh7h.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80450-wdetsg.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80529-lmet02.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-80725-1l6tliy.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-81018-azm74f.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-81246-1rjpksn.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-81371-aroaof.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140922-84122-7d6kls.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140926-7716-1nap0l.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57000-3nb1bj.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57206-197ca0p.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57328-1kra77f.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141002-57609-iymry0.txt +0 -8
- data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20141003-78097-1ocngi2.txt +0 -8
- data/spec/dummy/solr/conf/admin-extra.html +0 -31
- data/spec/dummy/solr/conf/elevate.xml +0 -36
- data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
- data/spec/dummy/solr/conf/protwords.txt +0 -21
- data/spec/dummy/solr/conf/schema.xml +0 -255
- data/spec/dummy/solr/conf/scripts.conf +0 -24
- data/spec/dummy/solr/conf/solrconfig.xml +0 -667
- data/spec/dummy/solr/conf/spellings.txt +0 -2
- data/spec/dummy/solr/conf/stopwords.txt +0 -58
- data/spec/dummy/solr/conf/synonyms.txt +0 -31
- data/spec/dummy/solr/default/data/index/_7b.fdt +0 -0
- data/spec/dummy/solr/default/data/index/_7b.fdx +0 -0
- data/spec/dummy/solr/default/data/index/_7b.fnm +0 -0
- data/spec/dummy/solr/default/data/index/_7b.nvd +0 -0
- data/spec/dummy/solr/default/data/index/_7b.nvm +0 -0
- data/spec/dummy/solr/default/data/index/_7b.si +0 -0
- data/spec/dummy/solr/default/data/index/_7b_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/default/data/index/_7b_Lucene41_0.pos +0 -0
- data/spec/dummy/solr/default/data/index/_7b_Lucene41_0.tim +0 -0
- data/spec/dummy/solr/default/data/index/_7b_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/segments.gen +0 -0
- data/spec/dummy/solr/default/data/index/segments_ev +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000524 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000525 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000526 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000527 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000528 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000529 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000530 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000531 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000532 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000533 +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 +0 -8
- 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/4F7/F90/default_role +0 -0
- data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/154f7b83f2da0e86effbe25f32135177 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3054c50144654f9c7e57bb0639a276e9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3bd7a263237ba366f64d938fe5303757 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d38d8658b30de1d068603968227680d4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
- data/spec/dummy/tmp/cache/stdout +0 -1653
- data/spec/dummy/tmp/pids/redis-test.pid +0 -1
data/spec/fixtures/reserves.yml
CHANGED
@@ -6,7 +6,7 @@ reserve_00001:
|
|
6
6
|
request_status_type_id: 4
|
7
7
|
id: 1
|
8
8
|
created_at: 2007-09-01 14:14:52.356803 +09:00
|
9
|
-
expired_at: <%= 1.week.from_now %>
|
9
|
+
expired_at: <%= 1.week.from_now.to_s(:db) %>
|
10
10
|
lock_version: 0
|
11
11
|
reserve_00002:
|
12
12
|
updated_at: 2007-09-01 14:20:05.530854 +09:00
|
@@ -15,7 +15,7 @@ reserve_00002:
|
|
15
15
|
request_status_type_id: 4
|
16
16
|
id: 2
|
17
17
|
created_at: 2007-09-01 14:20:05.530854 +09:00
|
18
|
-
expired_at: <%= 1.week.from_now %>
|
18
|
+
expired_at: <%= 1.week.from_now.to_s(:db) %>
|
19
19
|
lock_version: 0
|
20
20
|
reserve_00003:
|
21
21
|
updated_at: 2007-09-02 17:46:52.791614 +09:00
|
@@ -24,7 +24,7 @@ reserve_00003:
|
|
24
24
|
request_status_type_id: 4
|
25
25
|
id: 3
|
26
26
|
created_at: 2007-09-02 17:46:52.791614 +09:00
|
27
|
-
expired_at: <%= 1.week.from_now %>
|
27
|
+
expired_at: <%= 1.week.from_now.to_s(:db) %>
|
28
28
|
lock_version: 0
|
29
29
|
reserve_00004:
|
30
30
|
updated_at: 2007-09-02 18:37:25.576087 +09:00
|
@@ -33,7 +33,7 @@ reserve_00004:
|
|
33
33
|
request_status_type_id: 4
|
34
34
|
id: 4
|
35
35
|
created_at: 2007-09-02 18:37:25.576087 +09:00
|
36
|
-
expired_at: <%= 1.week.from_now %>
|
36
|
+
expired_at: <%= 1.week.from_now.to_s(:db) %>
|
37
37
|
lock_version: 0
|
38
38
|
reserve_00005:
|
39
39
|
updated_at: 2007-09-02 19:16:55.714812 +09:00
|
@@ -42,7 +42,7 @@ reserve_00005:
|
|
42
42
|
request_status_type_id: 4
|
43
43
|
id: 5
|
44
44
|
created_at: 2007-09-02 19:16:55.714812 +09:00
|
45
|
-
expired_at: <%= 1.week.from_now %>
|
45
|
+
expired_at: <%= 1.week.from_now.to_s(:db) %>
|
46
46
|
lock_version: 0
|
47
47
|
reserve_00006:
|
48
48
|
updated_at: 2007-09-02 19:20:06.530854 +09:00
|
@@ -51,7 +51,7 @@ reserve_00006:
|
|
51
51
|
request_status_type_id: 4
|
52
52
|
id: 6
|
53
53
|
created_at: 2007-09-02 19:20:06.530854 +09:00
|
54
|
-
expired_at: <%= 1.week.from_now %>
|
54
|
+
expired_at: <%= 1.week.from_now.to_s(:db) %>
|
55
55
|
lock_version: 0
|
56
56
|
reserve_00007:
|
57
57
|
updated_at: 2007-09-02 19:20:07.530854 +09:00
|
@@ -60,7 +60,7 @@ reserve_00007:
|
|
60
60
|
request_status_type_id: 4
|
61
61
|
id: 7
|
62
62
|
created_at: 2007-09-02 19:20:07.530854 +09:00
|
63
|
-
expired_at: <%= 1.week.from_now %>
|
63
|
+
expired_at: <%= 1.week.from_now.to_s(:db) %>
|
64
64
|
lock_version: 0
|
65
65
|
reserve_00008:
|
66
66
|
updated_at: 2007-09-02 19:46:53.791614 +09:00
|
@@ -69,7 +69,7 @@ reserve_00008:
|
|
69
69
|
request_status_type_id: 3
|
70
70
|
id: 8
|
71
71
|
created_at: 2007-09-02 19:46:53.791614 +09:00
|
72
|
-
expired_at: <%= 1.week.ago %>
|
72
|
+
expired_at: <%= 1.week.ago.to_s(:db) %>
|
73
73
|
lock_version: 0
|
74
74
|
reserve_00009:
|
75
75
|
updated_at: 2007-09-02 19:46:54.791614 +09:00
|
@@ -78,7 +78,7 @@ reserve_00009:
|
|
78
78
|
request_status_type_id: 3
|
79
79
|
id: 9
|
80
80
|
created_at: 2007-09-02 19:46:54.791614 +09:00
|
81
|
-
expired_at: <%= 1.day.ago %>
|
81
|
+
expired_at: <%= 1.day.ago.to_s(:db) %>
|
82
82
|
lock_version: 0
|
83
83
|
reserve_00010:
|
84
84
|
updated_at: 2007-09-02 19:46:55.791614 +09:00
|
@@ -87,8 +87,8 @@ reserve_00010:
|
|
87
87
|
request_status_type_id: 3
|
88
88
|
id: 10
|
89
89
|
created_at: 2007-09-02 19:46:55.791614 +09:00
|
90
|
-
expired_at: <%= 1.hour.ago %>
|
91
|
-
checked_out_at: <%= 1.week.ago %>
|
90
|
+
expired_at: <%= 1.hour.ago.to_s(:db) %>
|
91
|
+
checked_out_at: <%= 1.week.ago.to_s(:db) %>
|
92
92
|
item_id: 25
|
93
93
|
lock_version: 0
|
94
94
|
reserve_00011:
|
@@ -98,7 +98,7 @@ reserve_00011:
|
|
98
98
|
request_status_type_id: 3
|
99
99
|
id: 11
|
100
100
|
created_at: 2007-09-03 14:20:05.530854 +09:00
|
101
|
-
expired_at: <%= 1.day.ago %>
|
101
|
+
expired_at: <%= 1.day.ago.to_s(:db) %>
|
102
102
|
lock_version: 0
|
103
103
|
reserve_00012:
|
104
104
|
updated_at: 2007-09-03 14:20:06.530854 +09:00
|
@@ -107,7 +107,7 @@ reserve_00012:
|
|
107
107
|
request_status_type_id: 4
|
108
108
|
id: 12
|
109
109
|
created_at: 2007-09-03 14:20:06.530854 +09:00
|
110
|
-
expired_at: <%= 1.day.ago %>
|
110
|
+
expired_at: <%= 1.day.ago.to_s(:db) %>
|
111
111
|
lock_version: 0
|
112
112
|
reserve_00013:
|
113
113
|
updated_at: 2007-09-03 14:20:07.530854 +09:00
|
@@ -116,7 +116,7 @@ reserve_00013:
|
|
116
116
|
request_status_type_id: 3
|
117
117
|
id: 13
|
118
118
|
created_at: 2007-09-03 14:20:07.530854 +09:00
|
119
|
-
expired_at: <%= 1.day.ago %>
|
119
|
+
expired_at: <%= 1.day.ago.to_s(:db) %>
|
120
120
|
lock_version: 0
|
121
121
|
reserve_00014:
|
122
122
|
updated_at: 2007-09-03 14:20:08.530854 +09:00
|
@@ -125,8 +125,8 @@ reserve_00014:
|
|
125
125
|
request_status_type_id: 3
|
126
126
|
id: 14
|
127
127
|
created_at: 2007-09-03 14:20:08.530854 +09:00
|
128
|
-
retained_at: <%= 1.hour.from_now %>
|
129
|
-
expired_at: <%= 1.day.from_now %>
|
128
|
+
retained_at: <%= 1.hour.from_now.to_s(:db) %>
|
129
|
+
expired_at: <%= 1.day.from_now.to_s(:db) %>
|
130
130
|
item_id: 21
|
131
131
|
lock_version: 0
|
132
132
|
reserve_00015:
|
@@ -136,7 +136,7 @@ reserve_00015:
|
|
136
136
|
request_status_type_id: 3
|
137
137
|
id: 15
|
138
138
|
created_at: 2007-09-03 14:20:09.530854 +09:00
|
139
|
-
expired_at: <%= 1.day.from_now %>
|
139
|
+
expired_at: <%= 1.day.from_now.to_s(:db) %>
|
140
140
|
lock_version: 0
|
141
141
|
|
142
142
|
# == Schema Information
|
@@ -5,14 +5,12 @@ one:
|
|
5
5
|
start_date: 2008-12-15 18:43:02
|
6
6
|
end_date: 2008-12-16 18:43:02
|
7
7
|
note: MyText
|
8
|
-
state: pending
|
9
8
|
|
10
9
|
two:
|
11
10
|
id: 2
|
12
11
|
start_date: 2008-12-15 18:43:02
|
13
12
|
end_date: 2008-12-16 18:43:02
|
14
13
|
note: MyText
|
15
|
-
state: pending
|
16
14
|
|
17
15
|
# == Schema Information
|
18
16
|
#
|
@@ -22,7 +20,6 @@ two:
|
|
22
20
|
# start_date :datetime
|
23
21
|
# end_date :datetime
|
24
22
|
# note :text
|
25
|
-
# state :string(255)
|
26
23
|
# created_at :datetime
|
27
24
|
# updated_at :datetime
|
28
25
|
# started_at :datetime
|
@@ -5,14 +5,12 @@ one:
|
|
5
5
|
start_date: 2008-12-20 11:36:28
|
6
6
|
end_date: 2008-12-21 11:36:28
|
7
7
|
note: MyText
|
8
|
-
state: pending
|
9
8
|
|
10
9
|
two:
|
11
10
|
id: 2
|
12
11
|
start_date: 2008-12-20 11:36:28
|
13
12
|
end_date: 2008-12-21 11:36:28
|
14
13
|
note: MyText
|
15
|
-
state: pending
|
16
14
|
|
17
15
|
# == Schema Information
|
18
16
|
#
|
@@ -22,7 +20,6 @@ two:
|
|
22
20
|
# start_date :datetime
|
23
21
|
# end_date :datetime
|
24
22
|
# note :text
|
25
|
-
# state :string(255)
|
26
23
|
# created_at :datetime
|
27
24
|
# updated_at :datetime
|
28
25
|
# started_at :datetime
|
data/spec/fixtures/users.yml
CHANGED