enju_biblio 0.1.0.pre58 → 0.1.0.pre59
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/agent_merge_lists_controller.rb +93 -0
- data/app/controllers/agent_merges_controller.rb +87 -0
- data/app/controllers/agent_relationships_controller.rb +1 -1
- data/app/controllers/agents_controller.rb +1 -3
- data/app/controllers/creates_controller.rb +3 -3
- data/app/controllers/manifestation_relationships_controller.rb +1 -1
- data/app/controllers/manifestations_controller.rb +12 -12
- data/app/controllers/owns_controller.rb +3 -3
- data/app/controllers/picture_files_controller.rb +1 -1
- data/app/controllers/produces_controller.rb +3 -3
- data/app/controllers/realizes_controller.rb +3 -3
- data/app/controllers/series_statement_merge_lists_controller.rb +92 -0
- data/app/controllers/series_statement_merges_controller.rb +90 -0
- data/app/controllers/series_statements_controller.rb +1 -3
- data/app/helpers/manifestations_helper.rb +17 -17
- data/app/models/agent.rb +24 -26
- data/app/models/agent_import_file.rb +3 -3
- data/app/models/agent_import_result.rb +2 -2
- data/app/models/agent_merge.rb +21 -0
- data/app/models/agent_merge_list.rb +29 -0
- data/app/models/agent_relationship_type.rb +1 -1
- data/app/models/agent_type.rb +1 -1
- data/app/models/carrier_type.rb +2 -2
- data/app/models/content_type.rb +1 -1
- data/app/models/country.rb +8 -4
- data/app/models/create_type.rb +1 -1
- data/app/models/enju_biblio/ability.rb +12 -9
- data/app/models/form_of_work.rb +1 -1
- data/app/models/frequency.rb +1 -1
- data/app/models/identifier.rb +12 -0
- data/app/models/identifier_type.rb +2 -2
- data/app/models/import_request.rb +2 -1
- data/app/models/item.rb +3 -3
- data/app/models/language.rb +8 -1
- data/app/models/license.rb +1 -1
- data/app/models/manifestation.rb +42 -43
- data/app/models/manifestation_relationship_type.rb +1 -1
- data/app/models/medium_of_performance.rb +1 -1
- data/app/models/picture_file.rb +9 -9
- data/app/models/produce_type.rb +1 -1
- data/app/models/realize_type.rb +1 -1
- data/app/models/resource_import_file.rb +118 -63
- data/app/models/resource_import_result.rb +5 -4
- data/app/models/series_statement.rb +4 -7
- data/app/models/series_statement_merge.rb +21 -0
- data/app/models/series_statement_merge_list.rb +19 -0
- data/app/views/agent_merge_lists/_form.html.erb +11 -0
- data/app/views/agent_merge_lists/edit.html.erb +13 -0
- data/app/views/agent_merge_lists/index.html.erb +33 -0
- data/app/views/agent_merge_lists/new.html.erb +12 -0
- data/app/views/agent_merge_lists/show.html.erb +31 -0
- data/app/views/agent_merges/edit.html.erb +31 -0
- data/app/views/agent_merges/index.html.erb +32 -0
- data/app/views/agent_merges/new.html.erb +39 -0
- data/app/views/agent_merges/show.html.erb +25 -0
- data/app/views/agents/_index.html.erb +1 -3
- data/app/views/agents/_index_agent_merge_list.html.erb +53 -0
- data/app/views/layouts/manifestations.html.erb +1 -1
- data/app/views/manifestations/_form.html.erb +14 -2
- data/app/views/manifestations/_index_form_parent.html.erb +1 -1
- data/app/views/manifestations/_show.mods.builder +1 -4
- data/app/views/manifestations/_show.rdf.builder +1 -4
- data/app/views/manifestations/_show_detail_librarian.html.erb +1 -1
- data/app/views/manifestations/_show_detail_user.html.erb +1 -1
- data/app/views/manifestations/_show_index.html.erb +1 -1
- data/app/views/manifestations/_show_index.mobile.erb +2 -2
- data/app/views/manifestations/_show_parent_form.html.erb +1 -1
- data/app/views/manifestations/_show_series_index.html.erb +1 -1
- data/app/views/manifestations/_title.html.erb +1 -1
- data/app/views/picture_files/show.html.erb +1 -1
- data/app/views/resource_import_files/show.html.erb +9 -0
- data/app/views/resource_import_results/index.html.erb +2 -0
- data/app/views/resource_import_results/show.html.erb +6 -1
- data/app/views/series_statement_merge_lists/_form.html.erb +11 -0
- data/app/views/series_statement_merge_lists/edit.html.erb +13 -0
- data/app/views/series_statement_merge_lists/index.html.erb +33 -0
- data/app/views/series_statement_merge_lists/new.html.erb +12 -0
- data/app/views/series_statement_merge_lists/show.html.erb +31 -0
- data/app/views/series_statement_merges/_form.html.erb +12 -0
- data/app/views/series_statement_merges/edit.html.erb +31 -0
- data/app/views/series_statement_merges/index.html.erb +32 -0
- data/app/views/series_statement_merges/new.html.erb +39 -0
- data/app/views/series_statement_merges/show.html.erb +27 -0
- data/config/locales/translation_en.yml +25 -7
- data/config/locales/translation_ja.yml +25 -7
- data/config/routes.rb +20 -1
- data/db/migrate/005_create_manifestations.rb +0 -1
- data/db/migrate/133_create_agent_merges.rb +15 -0
- data/db/migrate/134_create_agent_merge_lists.rb +13 -0
- data/db/migrate/20110627035057_create_series_statement_merges.rb +1 -1
- data/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
- data/db/migrate/20140823083524_add_extent_to_manifestation.rb +5 -0
- data/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +5 -0
- data/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +9 -0
- data/lib/enju_biblio.rb +8 -0
- data/lib/enju_biblio/version.rb +1 -1
- data/lib/tasks/agent_type.rb +15 -0
- data/lib/tasks/enju_biblio_tasks.rake +2 -0
- data/spec/controllers/agent_merge_lists_controller_spec.rb +456 -0
- data/spec/controllers/agent_merges_controller_spec.rb +437 -0
- data/spec/controllers/series_statement_merge_lists_controller_spec.rb +439 -0
- data/spec/controllers/series_statement_merges_controller_spec.rb +433 -0
- data/spec/dummy/app/models/ability.rb +0 -5
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/schema.rb +22 -14
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/item_update_file.tsv +1 -1
- data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv +21 -19
- data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv +21 -19
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/{resource_export_file_20140818-53863-1jz1wlr.txt → resource_export_file_20140824-71278-o9rcl2.txt} +1 -1
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/{resource_export_file_20140818-55246-1rvhs1s.txt → resource_export_file_20140824-76052-14e2vr0.txt} +1 -1
- data/spec/dummy/solr/default/data/index/_n.fdt +0 -0
- data/spec/dummy/solr/{test/data/index/_49n.fdx → default/data/index/_n.fdx} +0 -0
- data/spec/dummy/solr/default/data/index/_n.fnm +0 -0
- data/spec/dummy/solr/default/data/index/_n.nvd +0 -0
- data/spec/dummy/solr/default/data/index/_n.nvm +0 -0
- data/spec/dummy/solr/default/data/index/_n.si +0 -0
- data/spec/dummy/solr/default/data/index/_n_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/default/data/index/_n_Lucene41_0.pos +0 -0
- data/spec/dummy/solr/default/data/index/_n_Lucene41_0.tim +0 -0
- data/spec/dummy/solr/default/data/index/_n_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/_o.fdt +0 -0
- data/spec/dummy/solr/default/data/index/_o.fdx +0 -0
- data/spec/dummy/solr/default/data/index/_o.fnm +0 -0
- data/spec/dummy/solr/default/data/index/_o.nvd +0 -0
- data/spec/dummy/solr/default/data/index/_o.nvm +0 -0
- data/spec/dummy/solr/default/data/index/_o.si +0 -0
- data/spec/dummy/solr/default/data/index/_o_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/default/data/index/_o_Lucene41_0.pos +0 -0
- data/spec/dummy/solr/default/data/index/_o_Lucene41_0.tim +0 -0
- data/spec/dummy/solr/default/data/index/_o_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/segments.gen +0 -0
- data/spec/dummy/solr/default/data/index/segments_15 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000030 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000031 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000032 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000033 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000034 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000035 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000036 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000037 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000038 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000039 +0 -0
- data/spec/dummy/solr/test/data/index/segments.gen +0 -0
- data/spec/dummy/solr/test/data/index/segments_401 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005178 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005179 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005180 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005181 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005182 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000005183 +0 -0
- data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
- data/spec/dummy/tmp/cache/6E4/420/search_engine_all +0 -0
- data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{173711a319dbf01f35a2ad8e1efe08b9 → 016035697c13f20f5d2b52792d85c604} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{0440b81b0aae840cf287a686585a8cec → 016f9220091ee2a634e3a6c7fbe9c147} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{19a44bc29c5173edea456f9416243854 → 052185a11dac17697ab8119d0eae969d} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/091f6b71beeef71345e4cb87e0e0f60e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{e58908ad0ccad6546faf9bcab669b0cd → 11bb992144d5d72e1251e5d4cf370f86} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{64ee480e95febf6b404c1264755ea42e → 120d4c2662a2d695d86719703963cbc2} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/12c4795597f72ed1be53a24203b9605a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{0c8f59d97121b79a2e2a0d009d6da9c3 → 1462d348fc6af4ed5164bd969f65ef40} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1ba5d9cae60d012a67e6c857c0f5aa3c +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/27e1b4616976bb325e2963da52263610 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/29755b7a6522fd2bd21a5821dcc1024c +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{0d8876cd5c35974067b09df39826ad64 → 2a4804739761c332dbea9b545ebdc90b} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3013236b88f48eb1a0e36f7ce20e9278 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/306cf2727f2c4d5bcc3318fdf704f9f8 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{1d0caee819e97b6e819aff48d160ba0e → 3137d593e6b38d7364165258707ba168} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3417713460df81bb2349531adec5f348 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3ef32f79b6e9b4487b09c38d17e96c5b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/4982460b51d59b2a6ca1a2a62f578883 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{2b35ad8fee7e1228e205669278e2adda → 4c00935da384db345e9d75e427a6ecfd} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{a2474b74df12470fb37c668b85b562c6 → 4d6ee78c9b5a731d2770590bdca965db} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{267e026cf7dcb8ed5ca66aa83dff1a87 → 4ec967e0b0aa8965b00d8d02580cb1e8} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{01c388ec88c5fa6d00409d725549a506 → 524145c58d27d8645853427057c8e352} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/53f3ea63c7f59d989da4e7299c5ebef6 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{86dfe8a3e156aeb6ebcd456b2251fab7 → 5401d1bbdbcca869f9ec530be8954c7b} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5657f9c72ff547052db9db89e95d1758 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5762cca052dd5d3eb8bb35e2ed9a59b8 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5e6bfa8ff735312df3c6e3ab5e4544dd +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/617d3692a7e14d57d7d7c18e62988c56 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6a45e3c9461983dc78a7a4f06326d98a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6ef07ba38c3fb7876f0dd5a9580ddb09 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{15aaed1a5a5f4f98d5c8d19084d7980d → 726c9190898ab9d89a285df9f73fc835} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/768618b68fc55616affb09d1366839bf +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/7cf6f7130d3eca66452321d70d360864 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/7e097aef96e9d7a3f16e013b6f612b68 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/84c8a64682205dba3f8edd60fc1ec8e5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/8c36936509297e044c5353b3c57148f9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{0483120d2ec851526d1beb322a87b34d → 8fe57feab5051fd40f4878b7a740486f} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{0dfa4223643dd4c4e2f977989012a78f → 94fe70b1fcf11d0f4ba62fd956b13410} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{16262df7c7e382ef78b21f453750ea94 → 9757a9437821225e1c033c19725d7f29} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9872a7a2c1dbfa71b55ebcf97dfa07b1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9a11ac4cf3c8597981773b8ea1c36659 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9ad166e60e3d477c78328181979a7b77 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9c500035359d42d1d6eb3152407753da +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{0c0062cfb97ef1437ab0020e724876c6 → a0d32bfbf69edb9affa96b926037041a} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/aa0c14240f47d6746cd5d3bf2fe4b936 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/aff11c6f1bdcce6d91baf69968f93ad6 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/b1cfee6085e55e41f311c5dfeda8661b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/b4125d2c5630528bd1587b244a3303d6 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{1572dfd6f1e555f4be1aa60ddc3cb0c0 → b4857dbfaac3e3d5aeb45b1beff2b88b} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{e8f801eeda49cba4a03cfd9e2a4562ae → b4f5eca040699a5d38403ce80236bc12} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/b530f21ccf5882027bf2aff5502dc79e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{24051f5752691433a5a205b04a62fca1 → b6fec44e6e93be3375951dad4faa2c14} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{305729f8ea45e96c3a7e75df920aa125 → b943165df1109f3c68280a04e5e960f8} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{2d65b40e585725207fd52ce4cf5134f4 → c48a5c8c0b091de16e629df2f6145f67} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{40e90f0c329b14292a9ff1a2fe907b39 → c5602b825ee6f6e1946e61a5c607d444} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ca2bbe58fd1ca1ca98a242a18b3f4ef3 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/cdad6edc528defc97cc803f9b28f4a71 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/cfb9cef7d320ba59870855aa2306bddd +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d626bad4b5037b4ffa8b7f7d15d76a53 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d648a0b0abb7fd7ff579d72ffe033d50 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d8e283e15fd77782ae12f9b18e5be456 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{479d8a0e6643a473b785734c1fb0655b → ddcad094e1d77a1ec8d17b77f1161b47} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e18b88fcf05f32d6b7e22c426144a580 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{45adf514664dd4134fb290b1938c56d8 → e1cad328d04e160bea05772ab16eacbc} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e52bd8c13070b84565f76938fe68458c +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ea20f8df525b74f3cb6581c9c8c10831 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/{3fc2b4de95dbb94dfe82ccfc97265cc4 → f02885699e51e1515eb7fd0a2f17cef7} +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f6a963700cd75861fcdc6fd9474e5e77 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f70653c23b5a12c74bf82c0e9afe906b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fb4d31a0ce2d585e276e7e5fc9407aba +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ffb3c7ae1ec3a76cac3e94303559fe51 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ffb98f25d690ed017b364714434126e5 +0 -0
- data/spec/dummy/tmp/cache/stdout +168 -6132
- data/spec/dummy/tmp/pids/redis-test.pid +1 -1
- data/spec/factories/agent_merge.rb +6 -0
- data/spec/factories/agent_merge_list.rb +5 -0
- data/spec/factories/series_statement_merge.rb +6 -0
- data/spec/factories/series_statement_merge_list.rb +5 -0
- data/spec/fixtures/agent_merge_lists.yml +27 -0
- data/spec/fixtures/agent_merges.yml +31 -0
- data/spec/fixtures/content_types.yml +13 -0
- data/spec/fixtures/frequencies.yml +13 -0
- data/spec/fixtures/manifestations.yml +7 -7
- data/spec/fixtures/resource_import_results.yml +1 -1
- data/spec/fixtures/series_statement_merge_lists.yml +27 -0
- data/spec/fixtures/series_statement_merges.yml +31 -0
- data/spec/models/agent_merge_list_spec.rb +18 -0
- data/spec/models/agent_merge_spec.rb +19 -0
- data/spec/models/manifestation_spec.rb +4 -4
- data/spec/models/resource_import_file_spec.rb +22 -11
- data/spec/models/resource_import_result_spec.rb +1 -1
- data/spec/models/series_statement_merge_list_spec.rb +20 -0
- data/spec/models/series_statement_merge_spec.rb +17 -0
- data/spec/requests/series_statement_merge_lists_spec.rb +11 -0
- data/spec/requests/series_statement_merges_spec.rb +11 -0
- data/spec/routing/series_statement_merge_lists_routing_spec.rb +35 -0
- data/spec/routing/series_statement_merges_routing_spec.rb +35 -0
- data/spec/views/series_statement_merge_lists/edit.html.erb_spec.rb +18 -0
- data/spec/views/series_statement_merge_lists/index.html.erb_spec.rb +22 -0
- data/spec/views/series_statement_merge_lists/new.html.erb_spec.rb +18 -0
- data/spec/views/series_statement_merge_lists/show.html.erb_spec.rb +15 -0
- data/spec/views/series_statement_merges/edit.html.erb_spec.rb +23 -0
- data/spec/views/series_statement_merges/index.html.erb_spec.rb +27 -0
- data/spec/views/series_statement_merges/new.html.erb_spec.rb +23 -0
- data/spec/views/series_statement_merges/show.html.erb_spec.rb +17 -0
- metadata +313 -311
- data/app/controllers/extents_controller.rb +0 -83
- data/app/models/agent_sweeper.rb +0 -29
- data/app/models/extent.rb +0 -20
- data/app/models/page_sweeper.rb +0 -35
- data/app/views/extents/_form.html.erb +0 -19
- data/app/views/extents/edit.html.erb +0 -13
- data/app/views/extents/index.html.erb +0 -52
- data/app/views/extents/new.html.erb +0 -12
- data/app/views/extents/show.html.erb +0 -29
- data/db/migrate/20090719201843_create_extents.rb +0 -12
- data/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb +0 -5
- data/spec/controllers/extents_controller_spec.rb +0 -167
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140702-50651-14mi4s9.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140702-50742-1fdbjo6.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140704-12784-ozvvo.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-18550-cc3qx2.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-19313-rlc624.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-20440-1o0htch.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-28145-o9qcd4.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140722-98727-1jesse9.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140816-17115-1c1tv13.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140816-18348-14d01b3.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-60268-1psjqua.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-60996-1cy28m2.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-67507-19qjhj3.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-69234-1cllrec.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140818-76875-1os6joy.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-1148-136brhb.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-473-1c326dm.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-93795-1x882ik.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-94274-1xr9d9e.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-94643-1fjcept.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-97947-mfqh5b.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-98488-126cvb4.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140819-98849-1lg47mm.txt +0 -147
- data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140820-19805-1p3heid.txt +0 -147
- data/spec/dummy/solr/default/data/index/segments_1 +0 -0
- data/spec/dummy/solr/test/data/index/_49n.fdt +0 -0
- data/spec/dummy/solr/test/data/index/_49n.fnm +0 -0
- data/spec/dummy/solr/test/data/index/_49n.nvd +0 -0
- data/spec/dummy/solr/test/data/index/_49n.nvm +0 -0
- data/spec/dummy/solr/test/data/index/_49n.si +0 -0
- data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.pos +0 -0
- data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.tim +0 -0
- data/spec/dummy/solr/test/data/index/_49n_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/test/data/index/segments_62f +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007855 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007856 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007857 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007858 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007859 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007860 +0 -0
- data/spec/dummy/solr/test/data/tlog/tlog.0000000000000007861 +0 -0
- data/spec/dummy/test/integration/resource_export_file_test.rb +0 -7
- data/spec/dummy/tmp/cache/assets/test/sprockets/1eeeee88b80ad204f61af2154ab097db +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/36fe3bdb5b7a6e84e23515bca1842154 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3ed0e4936463665c59155042a650dfa5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/46ed442c54e0ad50ed9cbff91bca2c03 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/4db7c7b5ea13aacccd89ea32460e2de0 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/4facb9d4adad5d1f55e19897f19ff502 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/51df74c0fa7fbfa41670caa0f4268d54 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/53ce49f7cb73ec18bfefea19be486fd5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/55de678ed3c84c51b3a4b4cf473da823 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5686725a34a5b152399098fe6811dfcc +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/59d9f2ec47e055feaa8deb88dd230fd9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5d30286c45c334a3e08806b2713ddbcd +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5f084c5c398edfb6e223c67ec8fbf80d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/60d030b3fef398bd6c75b5342c1e6951 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6273ac5ec2eeeb08808c520e45e7c353 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/64513343a4d1500f6642a9797f2d6caf +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6580b1bd3cb606ae0cc6a660e43ee91d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/66e8ff0ee49363fdd0e1866807515228 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/67ef1f14c3ad48997b6d2971949a9974 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6cf8b3b420dc28c045daec27150ade0a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/7395823b7ae60934b3053f26fdb362d4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/74c056fa2e48770cba3499207a5027f5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/796cd029cd1ff06c3212795cdcc5a7c4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/7de140ed6f303b9d00d8d703cced3349 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/7ef97a0c04f996570fa8d054e77614e4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/80348afae86df384b25e1e3bff21b13e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/814bc1bed3effa0bb4588eb8b75ab92a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/8488002e0e6035b7d00c3800c2c0e27e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/89c9228bae34e0ff18fd8fe7f6eb5847 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/8e2bf5102d77a2cff3dda27a5617a79d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9411c91747cff7187d3b5eb3d5401758 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/994c519d4fdf48cadf8846c64a7c217d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/a2ee8688f63b884277632a234086f7df +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/a3cea75f1356ef55329e78f86b4c72b1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/a5ff35005a82346756c8a2d9b564aa8e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/a72fe28675ab93fbb5f1fab49703e8b8 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/b0e11c6d89683eaa7256a44a164a2a12 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/b62c2d32477b85c1a8e33a4b3ba86483 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/b817a9a61cc21da35abec9d0dfb2a143 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/b9ad765321d7527b38c851119d4d6f41 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/bc086c9c936e5b91659a438d35126a90 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/bf17ca8affe2a1febca7f2a4e37cd77b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c21a9a8a5166b51d4c2737ad4b99c16b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c36b7431da1ae91722b1c4091e4ba084 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c3e87e99d52cd8082c8548a7aa63b9da +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c40786442706ae0cc6c793c6ee2500d3 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c42ec68313928d1544e733ae8383ef6d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c488c91e58a235d36a0ff8058e5a1004 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c4dbc19d89022a35885f5621f6b86eb3 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c6bbf5ca5c9b58807ba226fde0ccc60f +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c7b0db461dfcfc1108bf9a6a87fb909d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c9d565eb8899b86408d9fd06fbf039be +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/cfeee09fa6b6ec2344a7b44bf0676028 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d8d8b7e606faf0fa1c22a6c2ebc2b58f +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d909adefad62117a3e85463b83954827 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e22f9546f5d75bd3549886e979dcb96e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ea6fdf5f7aa83bf540d26f1ae12159a8 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/eef93e7d091d8118419fb96adf80387b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/efd104c04916854411c86a5440ba30e0 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f32a42f77e45018f7748de516be3c393 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fb91323d4585f2e27d281cdb4193beb1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fd080bad11122c7c3147a3fe1964c396 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fd88f9f1128cbff14dd2fa00800cfa10 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fe5bcfd29764185be3d476dee4108595 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ff64e9ded481959dfa8c78718e59e607 +0 -0
- data/spec/factories/extent.rb +0 -5
- data/spec/fixtures/extents.yml +0 -29
- data/spec/models/extent_spec.rb +0 -21
@@ -1,8 +1,9 @@
|
|
1
1
|
class ResourceImportResult < ActiveRecord::Base
|
2
2
|
attr_accessible :resource_import_file_id, :manifestation_id, :item_id, :body
|
3
|
-
default_scope order
|
4
|
-
scope :file_id, proc{|file_id| where(:
|
5
|
-
scope :failed, where(:
|
3
|
+
default_scope { order('resource_import_results.id') }
|
4
|
+
scope :file_id, proc{|file_id| where(resource_import_file_id: file_id)}
|
5
|
+
scope :failed, -> { where(manifestation_id: nil) }
|
6
|
+
scope :skipped, -> { where('error_message IS NOT NULL') }
|
6
7
|
|
7
8
|
belongs_to :resource_import_file
|
8
9
|
belongs_to :manifestation
|
@@ -22,5 +23,5 @@ end
|
|
22
23
|
# body :text
|
23
24
|
# created_at :datetime not null
|
24
25
|
# updated_at :datetime not null
|
26
|
+
# error_message :text
|
25
27
|
#
|
26
|
-
|
@@ -6,6 +6,8 @@ class SeriesStatement < ActiveRecord::Base
|
|
6
6
|
:title_subseries_transcription, :creator_string, :volume_number_string
|
7
7
|
attr_accessible :series_master
|
8
8
|
|
9
|
+
has_many :series_statement_merges, dependent: :destroy
|
10
|
+
has_many :series_statement_merge_lists, through: :series_statement_merges
|
9
11
|
belongs_to :manifestation, touch: true
|
10
12
|
belongs_to :root_manifestation, foreign_key: :root_manifestation_id, class_name: 'Manifestation', touch: true
|
11
13
|
validates_presence_of :original_title
|
@@ -19,7 +21,7 @@ class SeriesStatement < ActiveRecord::Base
|
|
19
21
|
text :numbering, :title_subseries, :numbering_subseries
|
20
22
|
integer :manifestation_id
|
21
23
|
integer :position
|
22
|
-
integer :series_statement_merge_list_ids, multiple: true
|
24
|
+
integer :series_statement_merge_list_ids, multiple: true
|
23
25
|
end
|
24
26
|
|
25
27
|
attr_accessor :selected
|
@@ -35,17 +37,12 @@ class SeriesStatement < ActiveRecord::Base
|
|
35
37
|
end
|
36
38
|
|
37
39
|
def create_root_series_statement
|
38
|
-
if series_master?
|
40
|
+
if series_master? && root_manifestation.nil?
|
39
41
|
self.root_manifestation = manifestation
|
40
42
|
else
|
41
43
|
self.root_manifestation = nil
|
42
44
|
end
|
43
45
|
end
|
44
|
-
|
45
|
-
if defined?(EnjuResourceMerge)
|
46
|
-
has_many :series_statement_merges, dependent: :destroy
|
47
|
-
has_many :series_statement_merge_lists, through: :series_statement_merges
|
48
|
-
end
|
49
46
|
end
|
50
47
|
|
51
48
|
# == Schema Information
|
@@ -0,0 +1,21 @@
|
|
1
|
+
class SeriesStatementMerge < ActiveRecord::Base
|
2
|
+
attr_accessible :series_statement_id, :series_statement_merge_list_id
|
3
|
+
belongs_to :series_statement, validate: true
|
4
|
+
belongs_to :series_statement_merge_list, validate: true
|
5
|
+
validates_presence_of :series_statement, :series_statement_merge_list
|
6
|
+
validates_associated :series_statement, :series_statement_merge_list
|
7
|
+
|
8
|
+
paginates_per 10
|
9
|
+
end
|
10
|
+
|
11
|
+
# == Schema Information
|
12
|
+
#
|
13
|
+
# Table name: series_statement_merges
|
14
|
+
#
|
15
|
+
# id :integer not null, primary key
|
16
|
+
# series_statement_id :integer not null
|
17
|
+
# series_statement_merge_list_id :integer not null
|
18
|
+
# created_at :datetime not null
|
19
|
+
# updated_at :datetime not null
|
20
|
+
#
|
21
|
+
|
@@ -0,0 +1,19 @@
|
|
1
|
+
class SeriesStatementMergeList < ActiveRecord::Base
|
2
|
+
attr_accessible :title
|
3
|
+
has_many :series_statement_merges, dependent: :destroy
|
4
|
+
has_many :series_statements, through: :series_statement_merges
|
5
|
+
validates_presence_of :title
|
6
|
+
|
7
|
+
paginates_per 10
|
8
|
+
end
|
9
|
+
|
10
|
+
# == Schema Information
|
11
|
+
#
|
12
|
+
# Table name: series_statement_merge_lists
|
13
|
+
#
|
14
|
+
# id :integer not null, primary key
|
15
|
+
# title :string(255)
|
16
|
+
# created_at :datetime not null
|
17
|
+
# updated_at :datetime not null
|
18
|
+
#
|
19
|
+
|
@@ -0,0 +1,13 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_merge_list')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
<%= render 'form' %>
|
5
|
+
</div>
|
6
|
+
</div>
|
7
|
+
|
8
|
+
<div id="submenu" class="ui-corner-all">
|
9
|
+
<ul>
|
10
|
+
<li><%= link_to t('page.show'), @agent_merge_list -%></li>
|
11
|
+
<li><%= link_to t('page.back'), agent_merge_lists_path -%></li>
|
12
|
+
</ul>
|
13
|
+
</div>
|
@@ -0,0 +1,33 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_merge_list')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
|
5
|
+
<table class="table table-striped index">
|
6
|
+
<tr>
|
7
|
+
<th><%= t('activerecord.attributes.agent_merge_list.title') -%></th>
|
8
|
+
<th><%= t('page.created_at') -%></th>
|
9
|
+
<th></th>
|
10
|
+
</tr>
|
11
|
+
|
12
|
+
<%- @agent_merge_lists.each do |agent_merge_list| -%>
|
13
|
+
<tr class="line<%= cycle("0", "1") -%>">
|
14
|
+
<td><%= link_to agent_merge_list.title, agent_merge_list -%></td>
|
15
|
+
<td><%= l(agent_merge_list.created_at) -%></td>
|
16
|
+
<td>
|
17
|
+
<%= link_to t('page.show'), agent_merge_list -%>
|
18
|
+
<%= link_to t('page.edit'), edit_agent_merge_list_path(agent_merge_list) -%>
|
19
|
+
<%= link_to t('page.destroy'), agent_merge_list, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
|
20
|
+
</td>
|
21
|
+
</tr>
|
22
|
+
<%- end -%>
|
23
|
+
</table>
|
24
|
+
|
25
|
+
<%= paginate(@agent_merge_lists) -%>
|
26
|
+
</div>
|
27
|
+
</div>
|
28
|
+
|
29
|
+
<div id="submenu" class="ui-corner-all">
|
30
|
+
<ul>
|
31
|
+
<li><%= link_to t('page.new', model: t('activerecord.models.agent_merge_list')), new_agent_merge_list_path -%></li>
|
32
|
+
</ul>
|
33
|
+
</div>
|
@@ -0,0 +1,12 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_merge_list')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
<%= render 'form' %>
|
5
|
+
</div>
|
6
|
+
</div>
|
7
|
+
|
8
|
+
<div id="submenu" class="ui-corner-all">
|
9
|
+
<ul>
|
10
|
+
<li><%= link_to t('page.back'), :back -%></li>
|
11
|
+
</ul>
|
12
|
+
</div>
|
@@ -0,0 +1,31 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.agent_merge_list')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
<p id="notice"><%= notice %></p>
|
5
|
+
|
6
|
+
<%= form_for(:agent_merge_list, url: agent_merge_list_path(@agent_merge_list, mode: 'merge'), html: { method: :put }) do |f| -%>
|
7
|
+
<p>
|
8
|
+
<strong><%= t('page.title') -%>:</strong>
|
9
|
+
<%= @agent_merge_list.title -%>
|
10
|
+
</p>
|
11
|
+
|
12
|
+
<ul>
|
13
|
+
<%- @agent_merge_list.agents.each do |agent| -%>
|
14
|
+
<li><%= radio_button_tag 'selected_agent_id', agent.id -%><%= link_to agent.full_name, agent -%></li>
|
15
|
+
<%- end -%>
|
16
|
+
</ul>
|
17
|
+
<%- if @agent_merge_list.agents.size > 1 -%>
|
18
|
+
<%= f.submit t('page.merge'), data: {confirm: t('page.are_you_sure')} -%>
|
19
|
+
<%- end -%>
|
20
|
+
<%- end -%>
|
21
|
+
|
22
|
+
</div>
|
23
|
+
</div>
|
24
|
+
|
25
|
+
<div id="submenu" class="ui-corner-all">
|
26
|
+
<ul>
|
27
|
+
<li><%= link_to t('page.listing', model: t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>
|
28
|
+
<li><%= link_to t('page.edit'), edit_agent_merge_list_path(@agent_merge_list) -%></li>
|
29
|
+
<li><%= back_to_index(flash[:page_info]) -%></li>
|
30
|
+
</ul>
|
31
|
+
</div>
|
@@ -0,0 +1,31 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_merge')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
|
5
|
+
<%= form_for(@agent_merge) do |f| -%>
|
6
|
+
<%= f.error_messages -%>
|
7
|
+
|
8
|
+
<div class="field">
|
9
|
+
<%= f.label t('activerecord.models.agent') -%><br />
|
10
|
+
<%= f.text_field :agent_id -%>
|
11
|
+
</div>
|
12
|
+
|
13
|
+
<div class="field">
|
14
|
+
<%= f.label t('activerecord.models.agent_merge_list') -%><br />
|
15
|
+
<%= f.text_field :agent_merge_list_id -%>
|
16
|
+
</div>
|
17
|
+
|
18
|
+
<div class="actions">
|
19
|
+
<%= f.submit %>
|
20
|
+
</div>
|
21
|
+
<%- end -%>
|
22
|
+
|
23
|
+
</div>
|
24
|
+
</div>
|
25
|
+
|
26
|
+
<div id="submenu" class="ui-corner-all">
|
27
|
+
<ul>
|
28
|
+
<li><%= link_to t('page.show'), @agent_merge -%></li>
|
29
|
+
<li><%= link_to t('page.back'), agent_merges_path -%></li>
|
30
|
+
</ul>
|
31
|
+
</div>
|
@@ -0,0 +1,32 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_merge')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
|
5
|
+
<table class="table table-striped index">
|
6
|
+
<tr>
|
7
|
+
<td><%= t('activerecord.models.agent') -%></td>
|
8
|
+
<td><%= t('activerecord.models.agent_merge_list') -%></td>
|
9
|
+
</tr>
|
10
|
+
|
11
|
+
<%- @agent_merges.each do |agent_merge| -%>
|
12
|
+
<tr class="line<%= cycle("0", "1") -%>">
|
13
|
+
<td><%= link_to agent_merge.agent.full_name, agent_merge.agent -%></td>
|
14
|
+
<td><%= link_to agent_merge.agent_merge_list.title, agent_merge.agent_merge_list -%></td>
|
15
|
+
<td><%= link_to t('page.show'), agent_merge -%></td>
|
16
|
+
<td><%= link_to t('page.edit'), edit_agent_merge_path(agent_merge) -%></td>
|
17
|
+
<td><%= link_to t('page.destroy'), agent_merge, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>
|
18
|
+
</tr>
|
19
|
+
<%- end -%>
|
20
|
+
</table>
|
21
|
+
|
22
|
+
<%= paginate(@agent_merges) -%>
|
23
|
+
</div>
|
24
|
+
</div>
|
25
|
+
|
26
|
+
<div id="submenu" class="ui-corner-all">
|
27
|
+
<ul>
|
28
|
+
<%- if @agent_merge_list -%>
|
29
|
+
<li><%= link_to t('page.add', model: t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>
|
30
|
+
<%- end -%>
|
31
|
+
</ul>
|
32
|
+
</div>
|
@@ -0,0 +1,39 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_merge')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
|
5
|
+
<%= form_for(@agent_merge) do |f| -%>
|
6
|
+
<%= f.error_messages -%>
|
7
|
+
<div class="field">
|
8
|
+
<%= f.label t('activerecord.models.agent') -%><br />
|
9
|
+
<%- if @agent -%>
|
10
|
+
<%= link_to @agent.full_name, @agent -%>
|
11
|
+
<%= f.hidden_field :agent_id -%>
|
12
|
+
<%- else -%>
|
13
|
+
<%= f.text_field :agent_id -%>
|
14
|
+
<%- end -%>
|
15
|
+
</div>
|
16
|
+
|
17
|
+
<div class="field">
|
18
|
+
<%= f.label t('activerecord.models.agent_merge_list') -%><br />
|
19
|
+
<%- if @agent_merge_list -%>
|
20
|
+
<%= link_to @agent_merge_list.title, agent_merge_list_path(@agent_merge_list) -%>
|
21
|
+
<%= f.hidden_field :agent_merge_list_id, value: @agent_merge_list.id -%>
|
22
|
+
<%- else -%>
|
23
|
+
<%= f.text_field :agent_merge_list_id, value: params[:agent_merge_list_id] -%>
|
24
|
+
<%- end -%>
|
25
|
+
</div>
|
26
|
+
|
27
|
+
<div class="actions">
|
28
|
+
<%= f.submit %>
|
29
|
+
</div>
|
30
|
+
<%- end -%>
|
31
|
+
|
32
|
+
</div>
|
33
|
+
</div>
|
34
|
+
|
35
|
+
<div id="submenu" class="ui-corner-all">
|
36
|
+
<ul>
|
37
|
+
<li><%= link_to t('page.back'), agent_merges_path -%></li>
|
38
|
+
</ul>
|
39
|
+
</div>
|
@@ -0,0 +1,25 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.showing', model: t('activerecord.models.agent_merge')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
<p id="notice"><%= notice %></p>
|
5
|
+
|
6
|
+
<p>
|
7
|
+
<strong><%= t('activerecord.models.agent') -%>:</strong>
|
8
|
+
<%= link_to @agent_merge.agent.full_name, @agent_merge.agent -%>
|
9
|
+
</p>
|
10
|
+
|
11
|
+
<p>
|
12
|
+
<strong><%= t('activerecord.models.agent_merge_list') -%>:</strong>
|
13
|
+
<%= link_to @agent_merge.agent_merge_list.title, @agent_merge.agent_merge_list -%>
|
14
|
+
</p>
|
15
|
+
|
16
|
+
</div>
|
17
|
+
</div>
|
18
|
+
|
19
|
+
<div id="submenu" class="ui-corner-all">
|
20
|
+
<ul>
|
21
|
+
<li><%= link_to t('page.add', model: t('activerecord.models.agent')), @agent_merge.agent_merge_list -%></li>
|
22
|
+
<li><%= link_to t('page.edit'), edit_agent_merge_path(@agent_merge) -%></li>
|
23
|
+
<li><%= back_to_index(flash[:page_info]) -%></li>
|
24
|
+
</ul>
|
25
|
+
</div>
|
@@ -28,9 +28,7 @@
|
|
28
28
|
<ul>
|
29
29
|
<%- if can? :create, Agent -%>
|
30
30
|
<li><%= link_to t('agent.add'), new_agent_path -%></li>
|
31
|
-
|
32
|
-
<li><%= link_to t('page.merge', model: t('activerecord.models.agent')), agent_merge_lists_path -%></li>
|
33
|
-
<% end %>
|
31
|
+
<li><%= link_to t('page.merge', model: t('activerecord.models.agent')), agent_merge_lists_path -%></li>
|
34
32
|
<%- end -%>
|
35
33
|
</ul>
|
36
34
|
</div>
|
@@ -0,0 +1,53 @@
|
|
1
|
+
<div id="content_detail" class="ui-corner-all">
|
2
|
+
<h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent')) -%></h1>
|
3
|
+
<div id="content_list">
|
4
|
+
|
5
|
+
<div class="search_form">
|
6
|
+
<%= form_for :agents, url: agent_merge_list_agents_path(@agent_merge_list), html: {method: 'get'} do -%>
|
7
|
+
<p>
|
8
|
+
<%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
|
9
|
+
<%- if can? :update, @agent_merge_list -%>
|
10
|
+
<%= render 'page/add' %>
|
11
|
+
<%- end -%>
|
12
|
+
<%= submit_tag t('page.search') -%>
|
13
|
+
<%= link_to t('page.back_to_index'), agent_merge_list_agents_path(@agent_merge_list) -%>
|
14
|
+
</p>
|
15
|
+
<%- end -%>
|
16
|
+
</div>
|
17
|
+
|
18
|
+
<table class="table table-striped index">
|
19
|
+
<tr>
|
20
|
+
<th><%= t('activerecord.attributes.agent.full_name') -%></th>
|
21
|
+
<th><%= t('activerecord.models.agent_type') -%></th>
|
22
|
+
<th><%= t('activerecord.attributes.agent.date_of_birth') -%></th>
|
23
|
+
<th></th>
|
24
|
+
</tr>
|
25
|
+
|
26
|
+
<%- @agents.each do |agent| -%>
|
27
|
+
<tr class="line<%= cycle("0", "1") -%>">
|
28
|
+
<td><%= link_to agent.full_name, agent_merge_list_agent_path(@agent_merge_list, agent) -%></td>
|
29
|
+
<td><%= agent.agent_type.display_name.localize -%></td>
|
30
|
+
<td><%=l agent.date_of_birth if agent.date_of_birth -%></td>
|
31
|
+
<td>
|
32
|
+
<%- if can? :delete, agent -%>
|
33
|
+
<%- if params[:mode] == 'add' -%>
|
34
|
+
<%= link_to t('page.add'), new_agent_merge_list_agent_merge_path(@agent_merge_list, agent_id: agent.id) unless @agent_merge_list.agents.include?(agent) -%>
|
35
|
+
<%- else -%>
|
36
|
+
<%- agent_merge = @agent_merge_list.agent_merges.where(agent_id: agent.id).first -%>
|
37
|
+
<%= link_to t('page.destroy'), agent_merge_list_agent_merge_path(@agent_merge_list, agent_merge), data: {confirm: t('page.are_you_sure')}, method: :delete if agent_merge -%>
|
38
|
+
<%- end -%>
|
39
|
+
<%- end -%>
|
40
|
+
</td>
|
41
|
+
</tr>
|
42
|
+
<%- end -%>
|
43
|
+
</table>
|
44
|
+
|
45
|
+
<%= paginate(@agents) -%>
|
46
|
+
</div>
|
47
|
+
</div>
|
48
|
+
|
49
|
+
<div id="submenu" class="ui-corner-all">
|
50
|
+
<ul>
|
51
|
+
<li><%= link_to t('page.listing', model: t('activerecord.models.agent_merge_list')), @agent_merge_list -%></li>
|
52
|
+
</ul>
|
53
|
+
</div>
|
@@ -14,7 +14,7 @@
|
|
14
14
|
<%= render 'manifestations/google_book_thumbnail_header' %>
|
15
15
|
<% end %>
|
16
16
|
<% end %>
|
17
|
-
<link rel="search" type="application/opensearchdescription+xml" title="<%= LibraryGroup.site_config.display_name.localize %>" href="<%= page_opensearch_url(format: :xml) %>"
|
17
|
+
<link rel="search" type="application/opensearchdescription+xml" title="<%= LibraryGroup.site_config.display_name.localize %>" href="<%= page_opensearch_url(format: :xml) %>" />
|
18
18
|
</head>
|
19
19
|
<body>
|
20
20
|
|
@@ -35,8 +35,8 @@
|
|
35
35
|
</div>
|
36
36
|
|
37
37
|
<div class="field">
|
38
|
-
<%= f.label :
|
39
|
-
<%= f.check_box :
|
38
|
+
<%= f.label :serial %>
|
39
|
+
<%= f.check_box :serial %>
|
40
40
|
</div>
|
41
41
|
|
42
42
|
<div class="field">
|
@@ -150,6 +150,18 @@
|
|
150
150
|
<%= render 'manifestations/subject_form', :f => f %>
|
151
151
|
<% end %>
|
152
152
|
|
153
|
+
<!--
|
154
|
+
<div class="field">
|
155
|
+
<%= f.label :extent -%>
|
156
|
+
<%= f.text_field :extent -%>
|
157
|
+
</div>
|
158
|
+
|
159
|
+
<div class="field">
|
160
|
+
<%= f.label :dimensions -%>
|
161
|
+
<%= f.text_field :dimensions -%>
|
162
|
+
</div>
|
163
|
+
-->
|
164
|
+
|
153
165
|
<div class="field">
|
154
166
|
<%= f.label :start_page -%>
|
155
167
|
<%= f.text_field :start_page, class: 'resource_integer' -%>
|