enju_biblio 0.3.10 → 0.4.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (362) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -3
  3. data/app/controllers/content_types_controller.rb +1 -1
  4. data/app/controllers/items_controller.rb +2 -5
  5. data/app/controllers/manifestations_controller.rb +20 -23
  6. data/app/controllers/resource_import_results_controller.rb +2 -6
  7. data/app/helpers/enju_biblio/application_helper.rb +5 -5
  8. data/app/helpers/manifestations_helper.rb +10 -10
  9. data/app/models/agent.rb +3 -3
  10. data/app/models/agent_import_file.rb +1 -1
  11. data/app/models/agent_relationship_type.rb +8 -7
  12. data/app/models/agent_type.rb +10 -7
  13. data/app/models/carrier_type.rb +14 -11
  14. data/app/models/content_type.rb +10 -7
  15. data/app/models/create_type.rb +8 -7
  16. data/app/models/doi_record.rb +36 -0
  17. data/app/models/form_of_work.rb +11 -8
  18. data/app/models/frequency.rb +10 -7
  19. data/app/models/identifier_type.rb +1 -0
  20. data/app/models/import_request.rb +0 -2
  21. data/app/models/isbn_record.rb +51 -0
  22. data/app/models/isbn_record_and_manifestation.rb +18 -0
  23. data/app/models/issn_record.rb +49 -0
  24. data/app/models/issn_record_and_manifestation.rb +18 -0
  25. data/app/models/item.rb +2 -50
  26. data/app/models/language.rb +10 -9
  27. data/app/models/license.rb +9 -7
  28. data/app/models/manifestation.rb +252 -148
  29. data/app/models/manifestation_relationship_type.rb +9 -7
  30. data/app/models/medium_of_performance.rb +11 -8
  31. data/app/models/periodical.rb +33 -0
  32. data/app/models/periodical_and_manifestation.rb +16 -0
  33. data/app/models/picture_file.rb +2 -0
  34. data/app/models/produce_type.rb +8 -7
  35. data/app/models/realize_type.rb +8 -7
  36. data/app/models/resource_export_file.rb +8 -6
  37. data/app/models/resource_export_file_state_machine.rb +1 -1
  38. data/app/models/resource_import_file.rb +62 -153
  39. data/app/views/agent_import_results/index.txt.erb +3 -0
  40. data/app/views/agent_relationship_types/index.html.erb +1 -1
  41. data/app/views/agent_relationship_types/show.html.erb +1 -1
  42. data/app/views/agent_relationships/_form.html.erb +1 -1
  43. data/app/views/agent_types/index.html.erb +1 -1
  44. data/app/views/agent_types/show.html.erb +1 -1
  45. data/app/views/agents/_agent.html.erb +1 -1
  46. data/app/views/agents/_agent_list.html.erb +2 -2
  47. data/app/views/agents/_form.html.erb +4 -4
  48. data/app/views/agents/_index_agent.html.erb +1 -1
  49. data/app/views/agents/_index_agent_merge_list.html.erb +1 -1
  50. data/app/views/agents/_index_expression.html.erb +2 -2
  51. data/app/views/agents/_index_manifestation.html.erb +2 -2
  52. data/app/views/agents/_index_work.html.erb +2 -2
  53. data/app/views/agents/index.atom.builder +1 -1
  54. data/app/views/agents/index.rss.builder +1 -1
  55. data/app/views/agents/show.html+phone.erb +2 -2
  56. data/app/views/agents/show.html.erb +2 -2
  57. data/app/views/carrier_types/index.html.erb +2 -2
  58. data/app/views/carrier_types/show.html.erb +3 -3
  59. data/app/views/content_types/index.html.erb +1 -1
  60. data/app/views/content_types/show.html.erb +1 -1
  61. data/app/views/countries/index.html.erb +1 -1
  62. data/app/views/countries/show.html.erb +1 -1
  63. data/app/views/create_types/index.html.erb +1 -1
  64. data/app/views/create_types/show.html.erb +1 -1
  65. data/app/views/creates/_form.html.erb +1 -1
  66. data/app/views/form_of_works/index.html.erb +1 -1
  67. data/app/views/form_of_works/show.html.erb +1 -1
  68. data/app/views/frequencies/index.html.erb +1 -1
  69. data/app/views/frequencies/show.html.erb +1 -1
  70. data/app/views/identifier_types/index.html.erb +1 -1
  71. data/app/views/identifier_types/show.html.erb +1 -1
  72. data/app/views/items/_form.html.erb +13 -33
  73. data/app/views/items/index.html+phone.erb +3 -3
  74. data/app/views/items/index.html.erb +3 -3
  75. data/app/views/items/show.html+phone.erb +5 -5
  76. data/app/views/items/show.html.erb +12 -27
  77. data/app/views/languages/index.html.erb +1 -1
  78. data/app/views/languages/show.html.erb +1 -1
  79. data/app/views/layouts/agents.html.erb +2 -2
  80. data/app/views/layouts/items.html.erb +1 -1
  81. data/app/views/layouts/manifestations.html.erb +4 -4
  82. data/app/views/licenses/index.html.erb +1 -1
  83. data/app/views/licenses/show.html.erb +1 -1
  84. data/app/views/manifestation_relationship_types/index.html.erb +1 -1
  85. data/app/views/manifestation_relationship_types/show.html.erb +1 -1
  86. data/app/views/manifestation_relationships/_form.html.erb +1 -1
  87. data/app/views/manifestations/_call_number.html.erb +3 -3
  88. data/app/views/manifestations/_export_detail.html.erb +0 -1
  89. data/app/views/manifestations/_export_list.html.erb +0 -1
  90. data/app/views/manifestations/_form.html.erb +5 -28
  91. data/app/views/manifestations/_identifier_fields.html.erb +1 -1
  92. data/app/views/manifestations/_manifestation.txt.erb +1 -1
  93. data/app/views/manifestations/_show_creators.html.erb +1 -1
  94. data/app/views/manifestations/_show_detail_librarian.html.erb +5 -25
  95. data/app/views/manifestations/_show_detail_user.html.erb +5 -13
  96. data/app/views/manifestations/_show_holding.html+phone.erb +3 -3
  97. data/app/views/manifestations/_show_holding.html.erb +2 -2
  98. data/app/views/manifestations/index.atom.builder +1 -1
  99. data/app/views/manifestations/index.opds.builder +1 -1
  100. data/app/views/manifestations/index.rdf.builder +1 -1
  101. data/app/views/manifestations/index.rss.builder +1 -1
  102. data/app/views/manifestations/index.txt.erb +1 -0
  103. data/app/views/manifestations/show.txt.erb +1 -0
  104. data/app/views/medium_of_performances/index.html.erb +1 -1
  105. data/app/views/medium_of_performances/show.html.erb +1 -1
  106. data/app/views/notifier/manifestation_info.en.text.erb +1 -1
  107. data/app/views/notifier/manifestation_info.ja.text.erb +1 -1
  108. data/app/views/picture_files/edit.html.erb +0 -4
  109. data/app/views/produce_types/index.html.erb +1 -1
  110. data/app/views/produce_types/show.html.erb +1 -1
  111. data/app/views/produces/_form.html.erb +1 -1
  112. data/app/views/realize_types/index.html.erb +1 -1
  113. data/app/views/realize_types/show.html.erb +1 -1
  114. data/app/views/realizes/_form.html.erb +1 -1
  115. data/app/views/resource_import_files/_results.html.erb +0 -6
  116. data/app/views/resource_import_files/new.html.erb +2 -2
  117. data/app/views/resource_import_results/index.html.erb +11 -0
  118. data/app/views/resource_import_results/index.txt.erb +3 -0
  119. data/app/views/series_statements/_form.html.erb +8 -6
  120. data/app/views/series_statements/show.html.erb +0 -12
  121. data/config/locales/translation_en.yml +1 -28
  122. data/config/locales/translation_ja.yml +3 -30
  123. data/config/routes.rb +0 -2
  124. data/db/migrate/20081027150907_create_picture_files.rb +2 -0
  125. data/db/migrate/20160319144230_create_issn_records.rb +11 -0
  126. data/db/migrate/20160506144040_create_isbn_records.rb +11 -0
  127. data/db/migrate/20170116134107_create_issn_record_and_manifestations.rb +11 -0
  128. data/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb +11 -0
  129. data/db/migrate/20190102034126_create_doi_records.rb +13 -0
  130. data/db/migrate/20190311154610_create_periodicals.rb +10 -0
  131. data/db/migrate/20190312033839_create_periodical_and_manifestations.rb +11 -0
  132. data/db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb +21 -0
  133. data/lib/enju_biblio/version.rb +1 -1
  134. data/lib/generators/enju_biblio/setup/setup_generator.rb +0 -2
  135. data/lib/generators/enju_biblio/setup/templates/db/fixtures/agent_relationship_types.yml +3 -3
  136. data/lib/generators/enju_biblio/setup/templates/db/fixtures/agent_types.yml +2 -4
  137. data/lib/generators/enju_biblio/setup/templates/db/fixtures/carrier_types.yml +8 -26
  138. data/lib/generators/enju_biblio/setup/templates/db/fixtures/content_types.yml +12 -24
  139. data/lib/generators/enju_biblio/setup/templates/db/fixtures/create_types.yml +4 -22
  140. data/lib/generators/enju_biblio/setup/templates/db/fixtures/form_of_works.yml +1 -1
  141. data/lib/generators/enju_biblio/setup/templates/db/fixtures/frequencies.yml +9 -18
  142. data/lib/generators/enju_biblio/setup/templates/db/fixtures/languages.yml +2 -4
  143. data/lib/generators/enju_biblio/setup/templates/db/fixtures/licenses.yml +2 -2
  144. data/lib/generators/enju_biblio/setup/templates/db/fixtures/manifestation_relationship_types.yml +2 -4
  145. data/lib/generators/enju_biblio/setup/templates/db/fixtures/medium_of_performances.yml +15 -0
  146. data/lib/generators/enju_biblio/setup/templates/db/fixtures/produce_types.yml +2 -19
  147. data/lib/generators/enju_biblio/setup/templates/db/fixtures/realize_types.yml +3 -21
  148. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_isbn_which_is_already_imported/assigns_a_newly_created_import_request_as_import_request.yml +121 -0
  149. data/spec/controllers/content_types_controller_spec.rb +1 -1
  150. data/spec/controllers/items_controller_spec.rb +1 -23
  151. data/spec/controllers/manifestations_controller_spec.rb +0 -49
  152. data/spec/dummy/app/helpers/application_helper.rb +1 -1
  153. data/spec/dummy/app/models/user.rb +4 -0
  154. data/spec/dummy/bin/bundle +1 -1
  155. data/spec/dummy/bin/setup +1 -3
  156. data/spec/dummy/bin/update +4 -2
  157. data/spec/dummy/bin/yarn +3 -3
  158. data/spec/dummy/config/application.rb +1 -2
  159. data/spec/dummy/config/database.yml +70 -9
  160. data/spec/dummy/config/initializers/assets.rb +2 -2
  161. data/spec/dummy/db/development.sqlite3 +0 -0
  162. data/spec/dummy/db/migrate/002_devise_create_users.rb +1 -0
  163. data/spec/dummy/db/migrate/113_create_events.rb +2 -4
  164. data/spec/dummy/db/migrate/154_create_messages.rb +4 -8
  165. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +3 -3
  166. data/spec/dummy/db/migrate/20081028093607_create_event_import_files.rb +2 -4
  167. data/spec/dummy/db/migrate/20090519203307_create_participates.rb +2 -4
  168. data/spec/dummy/db/migrate/20100925074639_create_event_import_results.rb +2 -2
  169. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +1 -0
  170. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +1 -1
  171. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +1 -1
  172. data/spec/dummy/db/migrate/20140523171309_create_event_import_file_transitions.rb +1 -1
  173. data/spec/dummy/db/migrate/20140524135607_create_bookmark_stat_transitions.rb +1 -1
  174. data/spec/dummy/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb +1 -1
  175. data/spec/dummy/db/migrate/20140812152348_create_event_export_files.rb +1 -1
  176. data/spec/dummy/db/migrate/20140812153137_create_event_export_file_transitions.rb +1 -1
  177. data/spec/dummy/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb +1 -1
  178. data/spec/dummy/db/migrate/20151128142913_create_places.rb +14 -0
  179. data/spec/dummy/db/migrate/20151201163718_add_place_id_to_event.rb +5 -0
  180. data/spec/dummy/db/migrate/20160703184258_add_most_recent_to_event_import_file_transitions.rb +9 -0
  181. data/spec/dummy/db/migrate/20160703184311_add_most_recent_to_event_export_file_transitions.rb +9 -0
  182. data/spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb +1 -1
  183. data/spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb +1 -1
  184. data/spec/dummy/db/migrate/20160815045420_add_most_recent_to_bookmark_stat_transitions.rb +9 -0
  185. data/spec/dummy/db/migrate/20170116150432_create_jpno_records.rb +10 -0
  186. data/spec/dummy/db/migrate/20171126072934_create_ndla_records.rb +10 -0
  187. data/spec/dummy/db/migrate/20180107162659_add_constraints_to_most_recent_for_message_transitions.rb +13 -0
  188. data/spec/dummy/db/migrate/20180107162711_add_constraints_to_most_recent_for_message_request_transitions.rb +13 -0
  189. data/spec/dummy/db/migrate/20180107164558_add_constraints_to_most_recent_for_event_import_file_transitions.rb +13 -0
  190. data/spec/dummy/db/migrate/20180107164617_add_constraints_to_most_recent_for_event_export_file_transitions.rb +13 -0
  191. data/spec/dummy/db/migrate/20180107172413_add_constraints_to_most_recent_for_bookmark_stat_transitions.rb +13 -0
  192. data/spec/dummy/db/migrate/20180709023035_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb +36 -0
  193. data/spec/dummy/db/migrate/20180709023036_add_missing_unique_indices.acts_as_taggable_on_engine.rb +26 -0
  194. data/spec/dummy/db/migrate/20180709023037_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +20 -0
  195. data/spec/dummy/db/migrate/20180709023038_add_missing_taggable_index.acts_as_taggable_on_engine.rb +15 -0
  196. data/spec/dummy/db/migrate/20180709023039_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +15 -0
  197. data/spec/dummy/db/migrate/20180709023040_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb +23 -0
  198. data/spec/dummy/db/migrate/20180709161346_add_created_at_to_tag.rb +6 -0
  199. data/spec/dummy/db/migrate/20181119170645_add_foreign_key_to_events_referencing_event_categories.rb +5 -0
  200. data/spec/dummy/db/migrate/20190501043418_create_ndl_bib_id_records.rb +10 -0
  201. data/spec/dummy/db/migrate/20190508160525_create_retains.rb +10 -0
  202. data/spec/dummy/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb +12 -0
  203. data/spec/dummy/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb +6 -0
  204. data/spec/dummy/db/migrate/20190630151446_add_display_name_translations_to_role.rb +5 -0
  205. data/spec/dummy/db/migrate/20190630153136_add_display_name_translations_to_event.rb +6 -0
  206. data/spec/dummy/db/migrate/20190706052525_add_display_name_translations_to_circulation_status.rb +5 -0
  207. data/spec/dummy/db/schema.rb +335 -221
  208. data/spec/dummy/db/test.sqlite3 +0 -0
  209. data/spec/factories/create_types.rb +8 -7
  210. data/spec/factories/produce_types.rb +8 -7
  211. data/spec/factories/realize_types.rb +8 -7
  212. data/spec/factories/series_statement.rb +3 -4
  213. data/spec/fixtures/agent_relationship_types.yml +8 -7
  214. data/spec/fixtures/agent_types.yml +11 -10
  215. data/spec/fixtures/carrier_types.yml +16 -15
  216. data/spec/fixtures/content_types.yml +20 -31
  217. data/spec/fixtures/create_types.yml +12 -15
  218. data/spec/fixtures/creates.yml +0 -2
  219. data/spec/fixtures/form_of_works.yml +11 -10
  220. data/spec/fixtures/frequencies.yml +17 -25
  221. data/spec/fixtures/items.yml +11 -12
  222. data/spec/fixtures/languages.yml +11 -11
  223. data/spec/fixtures/libraries.yml +30 -30
  224. data/spec/fixtures/library_groups.yml +11 -6
  225. data/spec/fixtures/licenses.yml +8 -7
  226. data/spec/fixtures/manifestation_relationship_types.yml +12 -11
  227. data/spec/fixtures/manifestations.yml +0 -1
  228. data/spec/fixtures/medium_of_performances.yml +10 -9
  229. data/spec/fixtures/picture_files.yml +2 -0
  230. data/spec/fixtures/produce_types.yml +10 -11
  231. data/spec/fixtures/produces.yml +0 -2
  232. data/spec/fixtures/profiles.yml +8 -5
  233. data/spec/fixtures/realize_types.yml +11 -13
  234. data/spec/fixtures/realizes.yml +0 -2
  235. data/spec/fixtures/request_status_types.yml +14 -14
  236. data/spec/fixtures/request_types.yml +13 -13
  237. data/spec/fixtures/resource_export_files.yml +1 -1
  238. data/spec/fixtures/resource_import_results.yml +2 -2
  239. data/spec/fixtures/roles.yml +22 -5
  240. data/spec/fixtures/shelves.yml +16 -16
  241. data/spec/fixtures/user_groups.yml +12 -12
  242. data/spec/fixtures/user_has_roles.yml +3 -4
  243. data/spec/fixtures/users.yml +0 -3
  244. data/spec/models/agent_relationship_type_spec.rb +8 -7
  245. data/spec/models/agent_type_spec.rb +8 -7
  246. data/spec/models/carrier_type_spec.rb +12 -11
  247. data/spec/models/content_type_spec.rb +8 -7
  248. data/spec/models/create_type_spec.rb +8 -7
  249. data/spec/models/doi_record_spec.rb +19 -0
  250. data/spec/models/form_of_work_spec.rb +8 -7
  251. data/spec/models/frequency_spec.rb +8 -7
  252. data/spec/models/item_spec.rb +0 -7
  253. data/spec/models/language_spec.rb +10 -9
  254. data/spec/models/license_spec.rb +8 -7
  255. data/spec/models/manifestation_relationship_type_spec.rb +8 -7
  256. data/spec/models/manifestation_spec.rb +16 -24
  257. data/spec/models/medium_of_performance_spec.rb +8 -7
  258. data/spec/models/periodical_and_manifestation_spec.rb +17 -0
  259. data/spec/models/periodical_spec.rb +16 -0
  260. data/spec/models/picture_file_spec.rb +2 -0
  261. data/spec/models/produce_type_spec.rb +8 -7
  262. data/spec/models/realize_type_spec.rb +8 -7
  263. data/spec/models/resource_export_file_spec.rb +9 -62
  264. data/spec/models/resource_import_file_spec.rb +14 -44
  265. data/spec/rails_helper.rb +8 -4
  266. data/spec/system/manifestations_spec.rb +0 -30
  267. data/spec/views/items/index.html.erb_spec.rb +6 -7
  268. data/spec/views/manifestations/{index.txt.ruby_spec.rb → index.txt.erb_spec.rb} +1 -1
  269. data/spec/views/manifestations/{show.txt.ruby_spec.rb → show.txt.erb_spec.rb} +2 -2
  270. data/spec/views/resource_import_results/show.html.erb_spec.rb +1 -1
  271. metadata +129 -285
  272. data/app/controllers/item_custom_properties_controller.rb +0 -69
  273. data/app/controllers/manifestation_custom_properties_controller.rb +0 -69
  274. data/app/models/item_custom_property.rb +0 -18
  275. data/app/models/item_custom_value.rb +0 -17
  276. data/app/models/manifestation_custom_property.rb +0 -18
  277. data/app/models/manifestation_custom_value.rb +0 -17
  278. data/app/policies/item_custom_property_policy.rb +0 -21
  279. data/app/policies/manifestation_custom_property_policy.rb +0 -21
  280. data/app/views/agent_import_results/index.txt.ruby +0 -5
  281. data/app/views/item_custom_properties/_form.html.erb +0 -32
  282. data/app/views/item_custom_properties/edit.html.erb +0 -13
  283. data/app/views/item_custom_properties/index.html.erb +0 -43
  284. data/app/views/item_custom_properties/new.html.erb +0 -12
  285. data/app/views/item_custom_properties/show.html.erb +0 -28
  286. data/app/views/manifestation_custom_properties/_form.html.erb +0 -32
  287. data/app/views/manifestation_custom_properties/edit.html.erb +0 -13
  288. data/app/views/manifestation_custom_properties/index.html.erb +0 -43
  289. data/app/views/manifestation_custom_properties/new.html.erb +0 -12
  290. data/app/views/manifestation_custom_properties/show.html.erb +0 -28
  291. data/app/views/manifestations/index.txt.ruby +0 -7
  292. data/app/views/manifestations/show.json.jbuilder +0 -2
  293. data/app/views/manifestations/show.txt.ruby +0 -5
  294. data/app/views/resource_import_results/index.txt.ruby +0 -5
  295. data/db/migrate/20190818075603_add_memo_to_manifestation.rb +0 -5
  296. data/db/migrate/20190818075628_add_memo_to_item.rb +0 -5
  297. data/db/migrate/20200425072340_create_manifestation_custom_properties.rb +0 -12
  298. data/db/migrate/20200425072349_create_item_custom_properties.rb +0 -12
  299. data/db/migrate/20200425074758_create_manifestation_custom_values.rb +0 -12
  300. data/db/migrate/20200425074822_create_item_custom_values.rb +0 -12
  301. data/lib/generators/enju_biblio/setup/templates/db/fixtures/agents.yml +0 -19
  302. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_import_custom_values.yml +0 -121
  303. data/spec/cassette_library/resource_import_results/index_txt_ruby/renders_a_list_of_resource_import_results.yml +0 -121
  304. data/spec/controllers/item_custom_properties_controller_spec.rb +0 -449
  305. data/spec/controllers/manifestation_custom_properties_controller_spec.rb +0 -449
  306. data/spec/dummy/db/migrate/20081117143156_create_inventory_files.rb +0 -18
  307. data/spec/dummy/db/migrate/20081117143455_create_inventories.rb +0 -17
  308. data/spec/dummy/db/migrate/20090706125521_add_attachments_inventory_to_inventory_file.rb +0 -15
  309. data/spec/dummy/db/migrate/20091202124834_create_versions.rb +0 -18
  310. data/spec/dummy/db/migrate/20100525171356_acts_as_taggable_on_migration.rb +0 -30
  311. data/spec/dummy/db/migrate/20111217234412_add_save_checkout_history_to_user.rb +0 -5
  312. data/spec/dummy/db/migrate/20111218002349_add_checkout_icalendar_token_to_user.rb +0 -6
  313. data/spec/dummy/db/migrate/20120413100431_add_fingerprint_to_inventory_file.rb +0 -5
  314. data/spec/dummy/db/migrate/20150421023923_create_identities.rb +0 -14
  315. data/spec/dummy/db/migrate/20151126005552_add_provider_to_identity.rb +0 -5
  316. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +0 -18
  317. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +0 -22
  318. data/spec/factories/item_custom_property.rb +0 -6
  319. data/spec/factories/item_custom_value.rb +0 -6
  320. data/spec/factories/manifestation_custom_property.rb +0 -6
  321. data/spec/factories/manifestation_custom_value.rb +0 -6
  322. data/spec/fixtures/carrier_type_has_checkout_types.yml +0 -31
  323. data/spec/fixtures/checkout_stat_has_manifestations.yml +0 -24
  324. data/spec/fixtures/checkout_stat_has_users.yml +0 -24
  325. data/spec/fixtures/checkout_types.yml +0 -34
  326. data/spec/fixtures/circulation_statuses.yml +0 -136
  327. data/spec/fixtures/inventory_files.yml +0 -40
  328. data/spec/fixtures/item_custom_properties.yml +0 -24
  329. data/spec/fixtures/manifestation_checkout_stats.yml +0 -29
  330. data/spec/fixtures/manifestation_custom_properties.yml +0 -24
  331. data/spec/fixtures/manifestation_reserve_stats.yml +0 -29
  332. data/spec/fixtures/reserve_stat_has_manifestations.yml +0 -24
  333. data/spec/fixtures/reserve_stat_has_users.yml +0 -24
  334. data/spec/fixtures/reserve_transitions.yml +0 -104
  335. data/spec/fixtures/reserves.yml +0 -143
  336. data/spec/fixtures/use_restrictions.yml +0 -93
  337. data/spec/fixtures/user_checkout_stats.yml +0 -28
  338. data/spec/fixtures/user_group_has_checkout_types.yml +0 -111
  339. data/spec/fixtures/user_reserve_stats.yml +0 -28
  340. data/spec/models/item_custom_property_spec.rb +0 -18
  341. data/spec/models/item_custom_value_spec.rb +0 -17
  342. data/spec/models/manifestation_custom_property_spec.rb +0 -18
  343. data/spec/models/manifestation_custom_value_spec.rb +0 -17
  344. data/spec/requests/item_custom_properties_spec.rb +0 -129
  345. data/spec/requests/manifestation_custom_properties_spec.rb +0 -129
  346. data/spec/routing/item_custom_properties_routing_spec.rb +0 -38
  347. data/spec/routing/manifestation_custom_properties_routing_spec.rb +0 -38
  348. data/spec/system/items_spec.rb +0 -115
  349. data/spec/system/series_statements_spec.rb +0 -16
  350. data/spec/views/agent_import_results/index.html.erb_spec.rb +0 -29
  351. data/spec/views/agent_import_results/index.txt.ruby_spec.rb +0 -20
  352. data/spec/views/agent_import_results/show.html.erb_spec.rb +0 -24
  353. data/spec/views/item_custom_properties/edit.html.erb_spec.rb +0 -21
  354. data/spec/views/item_custom_properties/index.html.erb_spec.rb +0 -25
  355. data/spec/views/item_custom_properties/new.html.erb_spec.rb +0 -21
  356. data/spec/views/item_custom_properties/show.html.erb_spec.rb +0 -16
  357. data/spec/views/manifestation_custom_properties/edit.html.erb_spec.rb +0 -21
  358. data/spec/views/manifestation_custom_properties/index.html.erb_spec.rb +0 -25
  359. data/spec/views/manifestation_custom_properties/new.html.erb_spec.rb +0 -21
  360. data/spec/views/manifestation_custom_properties/show.html.erb_spec.rb +0 -16
  361. data/spec/views/manifestations/show.json.jbuilder_spec.rb +0 -16
  362. data/spec/views/resource_import_results/index.txt.ruby_spec.rb +0 -22
@@ -0,0 +1,3 @@
1
+ <%- @agent_import_results.each do |agent_import_result| -%>
2
+ <%= agent_import_result.body %>
3
+ <%- end -%>
@@ -24,7 +24,7 @@
24
24
  </td>
25
25
  <td><%= agent_relationship_type.name -%></td>
26
26
  <td>
27
- <%= link_to agent_relationship_type.display_name.localize, agent_relationship_type -%>
27
+ <%= link_to agent_relationship_type.display_name, agent_relationship_type -%>
28
28
  <br />
29
29
  <%= agent_relationship_type.note %>
30
30
  </td>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.agent_relationship_type.display_name') -%>:</strong>
13
- <%= @agent_relationship_type.display_name.localize -%>
13
+ <%= @agent_relationship_type.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -23,7 +23,7 @@
23
23
  </div>
24
24
  <div class="field">
25
25
  <%= f.label :agent_relationship_type_id %><br />
26
- <%= f.select(:agent_relationship_type_id, @agent_relationship_types.collect{|r| [r.display_name.localize, r.id]}) -%>
26
+ <%= f.select(:agent_relationship_type_id, @agent_relationship_types.collect{|r| [r.display_name, r.id]}) -%>
27
27
  </div>
28
28
  <div class="actions">
29
29
  <%= f.submit %>
@@ -24,7 +24,7 @@
24
24
  </td>
25
25
  <td><%= agent_type.name -%></td>
26
26
  <td>
27
- <%= link_to agent_type.display_name.localize, agent_type -%>
27
+ <%= link_to agent_type.display_name, agent_type -%>
28
28
  <br />
29
29
  <%= agent_type.note %>
30
30
  </td>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.agent_type.display_name') -%>:</strong>
13
- <%= @agent_type.display_name.localize -%>
13
+ <%= @agent_type.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -3,7 +3,7 @@
3
3
  <%= link_to agent.full_name, agent -%><br />
4
4
  <%= agent.full_name_transcription -%>
5
5
  </td>
6
- <td><%= agent.agent_type.display_name.localize -%></td>
6
+ <td><%= agent.agent_type.display_name -%></td>
7
7
  <td>
8
8
  <%- if policy(agent).destroy? -%>
9
9
  <%= link_to t('page.edit'), edit_agent_path(agent) -%>
@@ -3,14 +3,14 @@
3
3
  <%- @agent.parents.each do |agent_relationship| -%>
4
4
  <li>
5
5
  [P]
6
- (<%= agent_relationship.agent_relationship_type.display_name.localize -%>)
6
+ (<%= agent_relationship.agent_relationship_type.display_name -%>)
7
7
  <%= link_to agent_relationship.parent.full_name, agent_relationship.parent -%>
8
8
  </li>
9
9
  <%- end -%>
10
10
  <%- @agent.children.each do |agent_relationship| -%>
11
11
  <li>
12
12
  [P]
13
- (<%= agent_relationship.agent_relationship_type.display_name.localize -%>)
13
+ (<%= agent_relationship.agent_relationship_type.display_name -%>)
14
14
  <%= link_to agent_relationship.child.full_name, agent_relationship.child -%>
15
15
  </li>
16
16
  <%- end -%>
@@ -4,7 +4,7 @@
4
4
 
5
5
  <div class="field">
6
6
  <%= f.label t('activerecord.models.agent_type') -%>
7
- <%= f.select(:agent_type_id, @agent_types.collect{|p| [p.display_name.localize, p.id]}) -%>
7
+ <%= f.select(:agent_type_id, @agent_types.collect{|p| [p.display_name, p.id]}) -%>
8
8
  </div>
9
9
 
10
10
  <div class="field">
@@ -52,12 +52,12 @@
52
52
 
53
53
  <div class="field">
54
54
  <%= f.label t('activerecord.models.language') -%>
55
- <%= f.select(:language_id, @languages.collect{|l| [l.display_name.localize, l.id]}) -%>
55
+ <%= f.select(:language_id, @languages.collect{|l| [l.display_name, l.id]}) -%>
56
56
  </div>
57
57
 
58
58
  <div class="field">
59
59
  <%= f.label t('activerecord.models.country') -%>
60
- <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%>
60
+ <%= f.select(:country_id, @countries.collect{|c| [c.display_name, c.id]}) -%>
61
61
  </div>
62
62
 
63
63
  <div class="field">
@@ -72,7 +72,7 @@
72
72
 
73
73
  <div class="field">
74
74
  <%= f.label t('role.required_role') -%>
75
- <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
75
+ <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}) -%>
76
76
  </div>
77
77
 
78
78
  <div class="actions">
@@ -32,7 +32,7 @@
32
32
  <%= link_to agent.full_name, agent -%><br />
33
33
  <%= agent.full_name_transcription -%>
34
34
  </td>
35
- <td><%= agent.agent_type.display_name.localize -%></td>
35
+ <td><%= agent.agent_type.display_name -%></td>
36
36
  <td><%=l agent.date_of_birth if agent.date_of_birth -%></td>
37
37
  <td>
38
38
  <%- if policy(agent).destroy? -%>
@@ -26,7 +26,7 @@
26
26
  <%- @agents.each do |agent| -%>
27
27
  <tr class="line<%= cycle("0", "1") -%>">
28
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>
29
+ <td><%= agent.agent_type.display_name -%></td>
30
30
  <td><%=l agent.date_of_birth if agent.date_of_birth -%></td>
31
31
  <td>
32
32
  <%- if policy(agent).destroy? -%>
@@ -30,8 +30,8 @@
30
30
  <%- @agents.each do |agent| -%>
31
31
  <tr class="line<%= cycle("0", "1") -%>">
32
32
  <td><%= link_to agent.full_name, agent -%></td>
33
- <td><%= expression.realized(agent).realize_type.display_name.localize if params[:mode] != 'add' and expression.realized(agent).try(:realize_type) -%></td>
34
- <td><%= agent.agent_type.display_name.localize -%></td>
33
+ <td><%= expression.realized(agent).realize_type.display_name if params[:mode] != 'add' and expression.realized(agent).try(:realize_type) -%></td>
34
+ <td><%= agent.agent_type.display_name -%></td>
35
35
  <td>
36
36
  <%- if policy(agent).destroy? -%>
37
37
  <%- if params[:mode] == 'add' -%>
@@ -26,8 +26,8 @@
26
26
  <%- @agents.each do |agent| -%>
27
27
  <tr class="line<%= cycle("0", "1") -%>">
28
28
  <td><%= link_to agent.full_name, agent -%></td>
29
- <td><%= manifestation.produced(agent).produce_type.display_name.localize if params[:mode] != 'add' and manifestation.produced(agent).try(:produce_type) -%></td>
30
- <td><%= agent.agent_type.display_name.localize -%></td>
29
+ <td><%= manifestation.produced(agent).produce_type.display_name if params[:mode] != 'add' and manifestation.produced(agent).try(:produce_type) -%></td>
30
+ <td><%= agent.agent_type.display_name -%></td>
31
31
  <td>
32
32
  <%- if policy(agent).destroy? -%>
33
33
  <%- if params[:mode] == 'add' -%>
@@ -34,8 +34,8 @@
34
34
  <%- @agents.each do |agent| -%>
35
35
  <tr class="line<%= cycle("0", "1") -%>">
36
36
  <td><%= link_to agent.full_name, agent -%></td>
37
- <td><%= work.created(agent).create_type.display_name.localize if params[:mode] != 'add' and work.created(agent).try(:create_type) -%></td>
38
- <td><%= agent.agent_type.display_name.localize -%></td>
37
+ <td><%= work.created(agent).create_type.display_name if params[:mode] != 'add' and work.created(agent).try(:create_type) -%></td>
38
+ <td><%= agent.agent_type.display_name -%></td>
39
39
  <td>
40
40
  <%- if policy(agent).destroy? -%>
41
41
  <%- if params[:mode] == 'add' -%>
@@ -1,5 +1,5 @@
1
1
  atom_feed(url: agents_url(format: :atom)) do |feed|
2
- feed.title t('agent.library_group_agent', library_group_name: @library_group.display_name.localize)
2
+ feed.title t('agent.library_group_agent', library_group_name: @library_group.display_name)
3
3
  feed.updated(@agents.first ? @agents.first.created_at : Time.zone.now)
4
4
 
5
5
  @agents.each do |agent|
@@ -3,7 +3,7 @@ xml.rss('version' => "2.0",
3
3
  'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
4
4
  'xmlns:atom' => "http://www.w3.org/2005/Atom"){
5
5
  xml.channel{
6
- xml.title t('agent.library_group_agent', library_group_name: @library_group.display_name.localize)
6
+ xml.title t('agent.library_group_agent', library_group_name: @library_group.display_name)
7
7
  xml.link "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: nil, only_path: true))}"
8
8
  xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
9
9
  xml.language @locale.to_s
@@ -20,7 +20,7 @@
20
20
  </tr>
21
21
  <tr>
22
22
  <td><strong><%= t('activerecord.models.agent_type') -%>:</strong></td>
23
- <td><%= @agent.agent_type.display_name.localize -%></td>
23
+ <td><%= @agent.agent_type.display_name -%></td>
24
24
  </tr>
25
25
  <tr>
26
26
  <td><strong><%= t('activerecord.attributes.agent.email') -%>:</strong></td>
@@ -44,7 +44,7 @@
44
44
  </tr>
45
45
  <tr>
46
46
  <td><strong><%= t('activerecord.models.language') -%>:</strong></td>
47
- <td><%= @agent.language.display_name.localize -%></td>
47
+ <td><%= @agent.language.display_name -%></td>
48
48
  </tr>
49
49
  <tr>
50
50
  <td><strong><%= t('activerecord.attributes.agent.note') -%>:</strong></td>
@@ -29,7 +29,7 @@
29
29
  </tr>
30
30
  <tr>
31
31
  <td><strong><%= t('activerecord.models.agent_type') -%>:</strong></td>
32
- <td><%= @agent.agent_type.display_name.localize -%></td>
32
+ <td><%= @agent.agent_type.display_name -%></td>
33
33
  </tr>
34
34
  <tr>
35
35
  <td><strong><%= t('activerecord.attributes.agent.email') -%>:</strong></td>
@@ -53,7 +53,7 @@
53
53
  </tr>
54
54
  <tr>
55
55
  <td><strong><%= t('activerecord.models.language') -%>:</strong></td>
56
- <td><%= @agent.language.display_name.localize -%></td>
56
+ <td><%= @agent.language.display_name -%></td>
57
57
  </tr>
58
58
  <tr>
59
59
  <td><strong><%= t('activerecord.attributes.agent.note') -%>:</strong></td>
@@ -23,11 +23,11 @@
23
23
  <%- end -%>
24
24
  </td>
25
25
  <td>
26
- <%= image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize) %>
26
+ <%= image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name) %>
27
27
  <%= carrier_type.name -%>
28
28
  </td>
29
29
  <td>
30
- <%= link_to carrier_type.display_name.localize, carrier_type -%>
30
+ <%= link_to carrier_type.display_name, carrier_type -%>
31
31
  <br />
32
32
  <%= carrier_type.note %>
33
33
  </td>
@@ -10,13 +10,13 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.carrier_type.display_name') -%>:</strong>
13
- <%= @carrier_type.display_name.localize -%>
13
+ <%= @carrier_type.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
17
17
  <strong><%= t('page.file') -%>:</strong>
18
18
  <%= link_to carrier_type_path(@carrier_type, format: :download) do -%>
19
- <%= image_tag(carrier_type_path(@carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: @carrier_type.display_name.localize) %>
19
+ <%= image_tag(carrier_type_path(@carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: @carrier_type.display_name) %>
20
20
  <%= @carrier_type.attachment_file_name %>
21
21
  <% end %>
22
22
  </p>
@@ -27,7 +27,7 @@
27
27
  </p>
28
28
  <ul>
29
29
  <% @carrier_type.checkout_types.each do |checkout_type| %>
30
- <li><%= link_to checkout_type.display_name.localize, checkout_type %></li>
30
+ <li><%= link_to checkout_type.display_name, checkout_type %></li>
31
31
  <% end %>
32
32
  </ul>
33
33
  <% end %>
@@ -24,7 +24,7 @@
24
24
  </td>
25
25
  <td><%= content_type.name -%></td>
26
26
  <td>
27
- <%= link_to content_type.display_name.localize, content_type -%>
27
+ <%= link_to content_type.display_name, content_type -%>
28
28
  <br />
29
29
  <%= content_type.note %>
30
30
  </td>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.content_type.display_name') -%>:</strong>
13
- <%= @content_type.display_name.localize -%>
13
+ <%= @content_type.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -19,7 +19,7 @@
19
19
  <%- end -%>
20
20
  </td>
21
21
  <td><%= country.name -%></td>
22
- <td><%= link_to country.display_name.localize, country -%></td>
22
+ <td><%= link_to country.display_name, country -%></td>
23
23
  <td>
24
24
  alpha-2: <%= country.alpha_2 -%></br>
25
25
  alpha-3: <%= country.alpha_3 -%></br>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.country.display_name') -%>:</strong>
13
- <%= @country.display_name.localize %>
13
+ <%= @country.display_name %>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -24,7 +24,7 @@
24
24
  </td>
25
25
  <td><%= create_type.name -%></td>
26
26
  <td>
27
- <%= link_to create_type.display_name.localize, create_type -%>
27
+ <%= link_to create_type.display_name, create_type -%>
28
28
  <br />
29
29
  <%= create_type.note %>
30
30
  </td>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.create_type.display_name') -%>:</strong>
13
- <%= @create_type.display_name.localize -%>
13
+ <%= @create_type.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -23,7 +23,7 @@
23
23
 
24
24
  <div class="field">
25
25
  <%= f.label t('activerecord.models.create_type') -%><br />
26
- <%= f.select :create_type_id, @create_types.map{|c| [c.display_name.localize, c.id]} %>
26
+ <%= f.select :create_type_id, @create_types.map{|c| [c.display_name, c.id]} %>
27
27
  </div>
28
28
 
29
29
  <div class="actions">
@@ -24,7 +24,7 @@
24
24
  </td>
25
25
  <td><%= form_of_work.name -%></td>
26
26
  <td>
27
- <%= link_to form_of_work.display_name.localize, form_of_work -%>
27
+ <%= link_to form_of_work.display_name, form_of_work -%>
28
28
  <br />
29
29
  <%= form_of_work.note %>
30
30
  </td>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.form_of_work.display_name') -%>:</strong>
13
- <%= @form_of_work.display_name.localize -%>
13
+ <%= @form_of_work.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -24,7 +24,7 @@
24
24
  </td>
25
25
  <td><%= frequency.name -%></td>
26
26
  <td>
27
- <%= link_to frequency.display_name.localize, frequency -%>
27
+ <%= link_to frequency.display_name, frequency -%>
28
28
  <br />
29
29
  <%= frequency.note %>
30
30
  </td>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.frequency.display_name') -%>:</strong>
13
- <%= @frequency.display_name.localize -%>
13
+ <%= @frequency.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -24,7 +24,7 @@
24
24
  </td>
25
25
  <td><%= identifier_type.name -%></td>
26
26
  <td>
27
- <%= link_to identifier_type.display_name.localize, identifier_type -%>
27
+ <%= link_to identifier_type.display_name, identifier_type -%>
28
28
  <br />
29
29
  <%= identifier_type.note %>
30
30
  </td>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.identifier_type.display_name') -%>:</strong>
13
- <%= @identifier_type.display_name.localize -%>
13
+ <%= @identifier_type.display_name -%>
14
14
  </p>
15
15
 
16
16
  <p>
@@ -1,12 +1,10 @@
1
1
  <%= render 'manifestations/title', manifestation: @item.manifestation -%>
2
- <% if defined?(EnjuSubject) %>
3
- <p>
4
- <%= t('activerecord.models.classification') -%>:
5
- <%- @item.manifestation.classifications.each do |classification| -%>
6
- <%= link_to "#{classification.classification_type.display_name}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") -%>
7
- <%- end -%>
8
- </p>
9
- <% end %>
2
+ <p>
3
+ <%= t('activerecord.models.classification') -%>:
4
+ <%- @item.manifestation.classifications.each do |classification| -%>
5
+ <%= link_to "#{classification.classification_type.display_name}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") -%>
6
+ <%- end -%>
7
+ </p>
10
8
  <%= render 'page/required_field' %>
11
9
  <%= simple_form_for(@item) do |f| -%>
12
10
  <%= f.error_messages -%>
@@ -14,26 +12,26 @@
14
12
 
15
13
  <div class="field">
16
14
  <%= f.label "#{t('activerecord.models.library')} / #{t('activerecord.models.shelf')}" -%>
17
- <%= f.select :library_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
18
- <%= f.select :shelf_id, @shelves.map{|s| [s.display_name.localize, s.id]} %>
15
+ <%= f.select :library_id, @libraries.map{|l| [l.display_name, l.id]} %>
16
+ <%= f.select :shelf_id, @shelves.map{|s| [s.display_name, s.id]} %>
19
17
  <%= render 'observe_field' %>
20
18
  </div>
21
19
 
22
20
  <% if defined?(EnjuCirculation) %>
23
21
  <div class="field">
24
22
  <%= f.label t('activerecord.models.checkout_type') -%>
25
- <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) -%>
23
+ <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name, c.id]}) -%>
26
24
  </div>
27
25
 
28
26
  <div class="field">
29
27
  <%= f.label t('activerecord.models.circulation_status') -%>
30
- <%= f.select(:circulation_status_id, @circulation_statuses.collect{|c| [c.display_name.localize, c.id]}) -%>
28
+ <%= f.select(:circulation_status_id, @circulation_statuses.collect{|c| [c.display_name, c.id]}) -%>
31
29
  </div>
32
30
 
33
31
  <div class="field">
34
32
  <%= f.label t('activerecord.models.use_restriction') -%>
35
33
  <%= f.fields_for :item_has_use_restriction do |i| %>
36
- <%= i.select :use_restriction_id, @use_restrictions.collect{|r| [r.display_name.localize, r.id]} %>
34
+ <%= i.select :use_restriction_id, @use_restrictions.collect{|r| [r.display_name, r.id]} %>
37
35
  <% end %>
38
36
  </div>
39
37
  <% end %>
@@ -50,7 +48,7 @@
50
48
 
51
49
  <div class="field">
52
50
  <%= f.label t('activerecord.models.budget_type') -%>
53
- <%= f.select(:budget_type_id, @budget_types.collect{|b| [b.display_name.localize, b.id]}, include_blank: true) -%>
51
+ <%= f.select(:budget_type_id, @budget_types.collect{|b| [b.display_name, b.id]}, include_blank: true) -%>
54
52
 
55
53
  <%= f.label t('activerecord.models.bookstore') -%>
56
54
  <%= f.select(:bookstore_id, @bookstores.collect{|b| [b.name, b.id]}, include_blank: true) -%>
@@ -68,7 +66,7 @@
68
66
 
69
67
  <div class="field">
70
68
  <%= f.label t('role.required_role') -%>
71
- <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
69
+ <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}) -%>
72
70
  </div>
73
71
 
74
72
  <div class="field">
@@ -94,24 +92,6 @@
94
92
  <%= f.text_area :note, class: 'resource_textarea' -%>
95
93
  </div>
96
94
 
97
- <% if ItemCustomProperty.first %>
98
- <div class="field">
99
- <% ItemCustomProperty.order(:position).each do |c| %>
100
- <% @item.item_custom_values.new(item_custom_property: c) unless @item.item_custom_values.map{|value| value.item_custom_property_id}.include?(c.id) %>
101
- <% end %>
102
- <%= f.fields_for :item_custom_values do |custom_form| %>
103
- <%= custom_form.label custom_form.object.item_custom_property.name.to_sym, custom_form.object.item_custom_property.display_name.localize %>
104
- <%= custom_form.hidden_field :item_custom_property_id %>
105
- <%= custom_form.text_field :value, class: 'form-control' %>
106
- <% end %>
107
- </div>
108
- <% end %>
109
-
110
- <div class="field">
111
- <%= f.label :memo -%><br />
112
- <%= f.text_area :memo, class: 'resource_textarea' -%>
113
- </div>
114
-
115
95
  <div class="field">
116
96
  <%= f.label :item_identifier -%>
117
97
  <%= f.text_field :item_identifier, class: 'resource_identifier' -%>