update forms

next-l · Feb 20, 2024 · 5f7f64c · 5f7f64c
1 parent 2c574a1
commit 5f7f64c
Show file tree

Hide file tree

Showing 46 changed files with 251 additions and 249 deletions.
diff --git a/app/views/agent_import_files/edit.html.erb b/app/views/agent_import_files/edit.html.erb
@@ -2,7 +2,7 @@
   <h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_import_file')) -%></h1>
   <div id="content_list">
 
-  <%= form_for(@agent_import_file) do |f| -%>
+  <%= form_with(model: @agent_import_file) do |f| -%>
     <%= error_messages(@agent_import_file) -%>
 
     <div class="field">

diff --git a/app/views/agent_import_files/new.html.erb b/app/views/agent_import_files/new.html.erb
@@ -2,7 +2,7 @@
   <h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_import_file')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@agent_import_file, html: { multipart: true }) do |f| -%>
+<%= form_with(model: @agent_import_file) do |f| -%>
   <%= error_messages(@agent_import_file) -%>
 
   <div class="field">

diff --git a/app/views/agents/_form.html.erb b/app/views/agents/_form.html.erb
@@ -1,6 +1,6 @@
 <%= render 'page/required_field' %>
-<%= form_for(@agent) do |f| -%>
-  <%= error_messages(@agent) -%>
+<%= form_with(model: agent) do |f| -%>
+  <%= error_messages(agent) -%>
 
   <div class="field">
     <%= f.label t('activerecord.models.agent_type') -%>

diff --git a/app/views/agents/edit.html.erb b/app/views/agents/edit.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', agent: @agent %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/agents/new.html.erb b/app/views/agents/new.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', model: t('activerecord.models.agent')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.agent')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', agent: @agent %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/bookstores/_form.html.erb b/app/views/bookstores/_form.html.erb
@@ -1,5 +1,5 @@
-<%= form_for(@bookstore) do |f| -%>
-  <%= error_messages(@bookstore) -%>
+<%= form_with(model: bookstore) do |f| -%>
+  <%= error_messages(bookstore) -%>
 
   <div class="field">
     <%= f.label :name -%><br />

diff --git a/app/views/bookstores/edit.html.erb b/app/views/bookstores/edit.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', model: t('activerecord.models.bookstore')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.editing', model: t('activerecord.models.bookstore')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', bookstore: @bookstore %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/bookstores/new.html.erb b/app/views/bookstores/new.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', model: t('activerecord.models.bookstore')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.bookstore')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', bookstore: @bookstore %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/checkouts/_form.html.erb b/app/views/checkouts/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(@checkout) do |f| %>
+<%= form_with(model: @checkout) do |f| %>
   <% if @checkout.errors.any? %>
   <div id="errorExplanation">
     <h2><%= pluralize(@checkout.errors.count, "error") %> prohibited this checkout from being saved:</h2>

diff --git a/app/views/checkouts/edit.html.erb b/app/views/checkouts/edit.html.erb
@@ -15,7 +15,7 @@
 
 <h3><%= t('checkout.renewal') -%></h3>
 <%- if @checkout.renewable? -%>
-  <%= form_for(@checkout) do |f| -%>
+  <%= form_with(model: @checkout) do |f| -%>
     <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, format: :only_date) if @new_due_date -%>
     <%= f.hidden_field :due_date, value: @new_due_date -%>
     <br />
@@ -28,7 +28,7 @@
 <% if current_user.has_role?('Librarian') %>
   <h3><%= t('checkout.editing_due_date') -%></h3>
 
-  <%= form_for(@checkout) do |f| -%>
+  <%= form_with(model: @checkout) do |f| -%>
     <%= error_messages(@checkout) -%>
 
     <div class="field">

diff --git a/app/views/checkouts/new.html.erb b/app/views/checkouts/new.html.erb
@@ -1,6 +1,6 @@
 <h1 class="title"><%= t('page.new', model: t('activerecord.models.checkouts')) -%></h1>
 
-<%= form_for(@checkout) do |f| -%>
+<%= form_with(model: @checkout) do |f| -%>
   <%= error_messages(@checkout) -%>
 
   <div class="field">

diff --git a/app/views/creates/_form.html.erb b/app/views/creates/_form.html.erb
@@ -1,10 +1,10 @@
-<%= form_for(@create) do |f| -%>
-  <%= error_messages(@create) -%>
+<%= form_with(model: create) do |f| -%>
+  <%= error_messages(create) -%>
 
   <div class="field">
     <%= f.label t('activerecord.models.agent') -%><br />
-    <%- if @create.agent -%>
-      <%= link_to @create.agent.full_name, @create.agent -%>
+    <%- if create.agent -%>
+      <%= link_to create.agent.full_name, create.agent -%>
       <%= f.hidden_field :agent_id -%>
     <%- else -%>
       <%= f.text_field :agent_id -%>
@@ -13,8 +13,8 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.work') -%><br />
-    <%- if @create.work -%>
-      <%= link_to @create.work.original_title, @create.work -%>
+    <%- if create.work -%>
+      <%= link_to create.work.original_title, create.work -%>
       <%= f.hidden_field :work_id -%>
     <%- else -%>
       <%= f.text_field :work_id -%>

diff --git a/app/views/event_categories/_form.html.erb b/app/views/event_categories/_form.html.erb
@@ -1,5 +1,5 @@
-<%= form_for(@event_category) do |f| %>
-  <%= error_messages(@event_category) %>
+<%= form_with(model: event_category) do |f| %>
+  <%= error_messages(event_category) %>
 
   <div class="field">
     <%= f.label :name %><br />

diff --git a/app/views/event_categories/edit.html.erb b/app/views/event_categories/edit.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', model: t('activerecord.models.event_category')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.editing', model: t('activerecord.models.event_category')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', event_category: @event_category %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/event_categories/new.html.erb b/app/views/event_categories/new.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', model: t('activerecord.models.event_category')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.event_category')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', event_category: @event_category %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/event_import_files/edit.html.erb b/app/views/event_import_files/edit.html.erb
@@ -1,20 +1,24 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', model: t('activerecord.models.event_import_file')) -%></h1>
-<div id="content_list">
+  <h1 class="title"><%= t('page.editing', model: t('activerecord.models.event_import_file')) -%></h1>
+  <div id="content_list">
 
-<%= form_for(@event_import_file) do |f| -%>
-  <%= error_messages(@event_import_file) -%>
+  <%= form_with(model: @event_import_file) do |f| -%>
+    <%= error_messages(@event_import_file) -%>
 
-  <div class="field">
-    <%= f.label :note -%><br />
-    <%= f.text_area :note -%>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<%- end -%>
+    <div class="field">
+      <%= f.label :event_import_file_name -%><br />
+      <%= f.text_field :event_import_file_name -%>
+    </div>
 
-</div>
+    <div class="field">
+      <%= f.label :note -%><br />
+      <%= f.text_area :note -%>
+    </div>
+
+    <div class="actions">
+      <%= f.submit %>
+    </div>
+  <%- end -%>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/event_import_files/new.html.erb b/app/views/event_import_files/new.html.erb
@@ -1,56 +1,54 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
   <h1 class="title"><%= t('page.new', model: t('activerecord.models.event_import_file')) -%></h1>
-<div id="content_list">
-
-<%= form_for(@event_import_file, html: { multipart: true }) do |f| -%>
-  <%= error_messages(@event_import_file) -%>
-
-  <div class="field">
-    <%= f.label t('page.file') -%><br />
-    <%= f.file_field :attachment -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :edit_mode -%><br />
-    <%= f.radio_button :edit_mode, 'create', checked: 'checked' %>
-    <%= f.label :edit_mode, t('page.create'), value: 'create' %>
-    <%= f.radio_button :edit_mode, 'update' %>
-    <%= f.label :edit_mode, t('page.update'), value: 'update' %>
-    <%= f.radio_button :edit_mode, 'destroy' %>
-    <%= f.label :edit_mode, t('page.destroy'), value: 'destroy' %>
-  </div>
-
-  <div class="field">
-    <%= f.label :user_encoding -%><br />
-    <%= f.radio_button :user_encoding, 'auto_detect', checked: 'checked' %>
-    <%= f.label :user_encoding, t('import.auto_detect'), value: 'auto_detect' %>
-    <%= f.radio_button :user_encoding, 'utf-8' %>
-    <%= f.label :user_encoding, 'UTF-8', value: 'utf-8' %>
-    <%= f.radio_button :user_encoding, 'shift_jis' %>
-    <%= f.label :user_encoding, 'Shift_JIS', value: 'shift_jis' %>
-    <%= f.radio_button :user_encoding, 'euc-jp' %>
-    <%= f.label :user_encoding, 'EUC-JP', value: 'euc-jp' %>
-  </div>
-
-  <div class="field">
-    <%= f.label :default_event_category_id -%>
-    <%= f.select(:default_event_category_id, @event_categories.collect{|e| [e.display_name.localize, e.id]}) -%><br />
-    <%= t('event_import_file.default_event_category') %>
-  </div>
-
-  <div class="field">
-    <%= f.label :default_library_id -%>
-    <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%><br />
-    <%= t('event_import_file.default_library') %>
-  </div>
-
-  <div class="actions">
-    <%= f.hidden_field :mode, value: 'import' %>
-    <%= f.submit t('page.start_import') %>
-  </div>
-<%- end -%>
-
-</div>
+  <div id="content_list">
+
+  <%= form_with(model: @event_import_file) do |f| -%>
+    <%= error_messages(@event_import_file) -%>
+
+    <div class="field">
+      <%= f.label t('page.file') -%><br />
+      <%= f.file_field :attachment -%>
+    </div>
+
+    <div class="field">
+      <%= f.label :edit_mode -%><br />
+      <%= f.radio_button :edit_mode, 'create', checked: 'checked' %>
+      <%= f.label :edit_mode, t('page.create'), value: 'create' %>
+      <%= f.radio_button :edit_mode, 'update' %>
+      <%= f.label :edit_mode, t('page.update'), value: 'update' %>
+      <%= f.radio_button :edit_mode, 'destroy' %>
+      <%= f.label :edit_mode, t('page.destroy'), value: 'destroy' %>
+    </div>
+
+    <div class="field">
+      <%= f.label :user_encoding -%><br />
+      <%= f.radio_button :user_encoding, 'auto_detect', checked: 'checked' %>
+      <%= f.label :user_encoding, t('import.auto_detect'), value: 'auto_detect' %>
+      <%= f.radio_button :user_encoding, 'utf-8' %>
+      <%= f.label :user_encoding, 'UTF-8', value: 'utf-8' %>
+      <%= f.radio_button :user_encoding, 'shift_jis' %>
+      <%= f.label :user_encoding, 'Shift_JIS', value: 'shift_jis' %>
+      <%= f.radio_button :user_encoding, 'euc-jp' %>
+      <%= f.label :user_encoding, 'EUC-JP', value: 'euc-jp' %>
+    </div>
+
+    <div class="field">
+      <%= f.label :default_event_category_id -%>
+      <%= f.select(:default_event_category_id, @event_categories.collect{|e| [e.display_name.localize, e.id]}) -%><br />
+      <%= t('event_import_file.default_event_category') %>
+    </div>
+
+    <div class="field">
+      <%= f.label :default_library_id -%>
+      <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%><br />
+      <%= t('event_import_file.default_library') %>
+    </div>
+
+    <div class="actions">
+      <%= f.hidden_field :mode, value: 'import' %>
+      <%= f.submit t('page.start_import') %>
+    </div>
+  <%- end -%>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/languages/_form.html.erb b/app/views/languages/_form.html.erb
@@ -1,9 +1,9 @@
-<%= form_for(@language) do |f| %>
-  <%= error_messages(@language) %>
+<%= form_with(model: language) do |f| %>
+  <%= error_messages(language) %>
 
   <div class="field">
     <%= f.label :name %>:<br />
-    <%= @language.name %>
+    <%= language.name %>
   </div>
 
   <div class="field">

diff --git a/app/views/languages/edit.html.erb b/app/views/languages/edit.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', model: t('activerecord.models.language')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.editing', model: t('activerecord.models.language')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', language: @language %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

diff --git a/app/views/languages/new.html.erb b/app/views/languages/new.html.erb
@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', model: t('activerecord.models.language')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.language')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', language: @language %>
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">