diff --git a/app/views/agent_import_files/edit.html.erb b/app/views/agent_import_files/edit.html.erb index f37f4c588b..bc666228af 100644 --- a/app/views/agent_import_files/edit.html.erb +++ b/app/views/agent_import_files/edit.html.erb @@ -2,7 +2,7 @@

<%= t('page.editing', model: t('activerecord.models.agent_import_file')) -%>

- <%= form_for(@agent_import_file) do |f| -%> + <%= form_with(model: @agent_import_file) do |f| -%> <%= error_messages(@agent_import_file) -%>
diff --git a/app/views/agent_import_files/new.html.erb b/app/views/agent_import_files/new.html.erb index ce589c0634..5ffd40381e 100644 --- a/app/views/agent_import_files/new.html.erb +++ b/app/views/agent_import_files/new.html.erb @@ -2,7 +2,7 @@

<%= t('page.new', model: t('activerecord.models.agent_import_file')) -%>

-<%= form_for(@agent_import_file, html: { multipart: true }) do |f| -%> +<%= form_with(model: @agent_import_file) do |f| -%> <%= error_messages(@agent_import_file) -%>
diff --git a/app/views/agents/_form.html.erb b/app/views/agents/_form.html.erb index 6dc2fd6c4f..8c2a9e3bab 100644 --- 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) -%>
<%= f.label t('activerecord.models.agent_type') -%> diff --git a/app/views/agents/edit.html.erb b/app/views/agents/edit.html.erb index 4201faa884..f8678271cd 100644 --- a/app/views/agents/edit.html.erb +++ b/app/views/agents/edit.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.editing', model: t('activerecord.models.agent')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.editing', model: t('activerecord.models.agent')) -%>

+
+ <%= render 'form', agent: @agent %> +
diff --git a/app/views/agents/new.html.erb b/app/views/agents/new.html.erb index 0670e5d142..e69eb9f228 100644 --- a/app/views/agents/new.html.erb +++ b/app/views/agents/new.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.new', model: t('activerecord.models.agent')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.new', model: t('activerecord.models.agent')) -%>

+
+ <%= render 'form', agent: @agent %> +
diff --git a/app/views/bookstores/_form.html.erb b/app/views/bookstores/_form.html.erb index f0258901f5..c8e03fa7f8 100644 --- 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) -%>
<%= f.label :name -%>
diff --git a/app/views/bookstores/edit.html.erb b/app/views/bookstores/edit.html.erb index ca2b22afb5..7fe3cd30ac 100644 --- a/app/views/bookstores/edit.html.erb +++ b/app/views/bookstores/edit.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.editing', model: t('activerecord.models.bookstore')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.editing', model: t('activerecord.models.bookstore')) -%>

+
+ <%= render 'form', bookstore: @bookstore %> +
diff --git a/app/views/bookstores/new.html.erb b/app/views/bookstores/new.html.erb index d78e4d7058..cc7fde472e 100644 --- a/app/views/bookstores/new.html.erb +++ b/app/views/bookstores/new.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.new', model: t('activerecord.models.bookstore')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.new', model: t('activerecord.models.bookstore')) -%>

+
+ <%= render 'form', bookstore: @bookstore %> +
diff --git a/app/views/checkouts/_form.html.erb b/app/views/checkouts/_form.html.erb index 126d8603ef..abbe9f1eba 100644 --- 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? %>

<%= pluralize(@checkout.errors.count, "error") %> prohibited this checkout from being saved:

diff --git a/app/views/checkouts/edit.html.erb b/app/views/checkouts/edit.html.erb index 5d1c2a12a7..f012784b66 100644 --- a/app/views/checkouts/edit.html.erb +++ b/app/views/checkouts/edit.html.erb @@ -15,7 +15,7 @@

<%= t('checkout.renewal') -%>

<%- 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 -%>
@@ -28,7 +28,7 @@ <% if current_user.has_role?('Librarian') %>

<%= t('checkout.editing_due_date') -%>

- <%= form_for(@checkout) do |f| -%> + <%= form_with(model: @checkout) do |f| -%> <%= error_messages(@checkout) -%>
diff --git a/app/views/checkouts/new.html.erb b/app/views/checkouts/new.html.erb index 6752f442a7..93b4b43c62 100644 --- a/app/views/checkouts/new.html.erb +++ b/app/views/checkouts/new.html.erb @@ -1,6 +1,6 @@

<%= t('page.new', model: t('activerecord.models.checkouts')) -%>

-<%= form_for(@checkout) do |f| -%> +<%= form_with(model: @checkout) do |f| -%> <%= error_messages(@checkout) -%>
diff --git a/app/views/creates/_form.html.erb b/app/views/creates/_form.html.erb index 1009be20f6..df057ce809 100644 --- 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) -%>
<%= f.label t('activerecord.models.agent') -%>
- <%- 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 @@
<%= f.label t('activerecord.models.work') -%>
- <%- 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/creates/edit.html.erb b/app/views/creates/edit.html.erb index cc708ceb72..b4c9ee62f1 100644 --- a/app/views/creates/edit.html.erb +++ b/app/views/creates/edit.html.erb @@ -1,7 +1,7 @@

<%= t('page.editing', model: t('activerecord.models.create')) -%>

- <%= render 'form' %> + <%= render 'form', create: @create %>
diff --git a/app/views/creates/new.html.erb b/app/views/creates/new.html.erb index 99511b1d1e..bb53b62fd5 100644 --- a/app/views/creates/new.html.erb +++ b/app/views/creates/new.html.erb @@ -1,7 +1,7 @@

<%= t('page.new', model: t('activerecord.models.create')) -%>

- <%= render 'form' %> + <%= render 'form', create: @create %>
diff --git a/app/views/event_categories/_form.html.erb b/app/views/event_categories/_form.html.erb index 701effaeb0..d7cc53661f 100644 --- 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) %>
<%= f.label :name %>
diff --git a/app/views/event_categories/edit.html.erb b/app/views/event_categories/edit.html.erb index 8ef7682d0e..7a79ae7509 100644 --- a/app/views/event_categories/edit.html.erb +++ b/app/views/event_categories/edit.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.editing', model: t('activerecord.models.event_category')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.editing', model: t('activerecord.models.event_category')) -%>

+
+ <%= render 'form', event_category: @event_category %> +
diff --git a/app/views/event_categories/new.html.erb b/app/views/event_categories/new.html.erb index 609bab80b0..bf85d04edc 100644 --- a/app/views/event_categories/new.html.erb +++ b/app/views/event_categories/new.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.new', model: t('activerecord.models.event_category')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.new', model: t('activerecord.models.event_category')) -%>

+
+ <%= render 'form', event_category: @event_category %> +
diff --git a/app/views/event_import_files/edit.html.erb b/app/views/event_import_files/edit.html.erb index 3ac27970b6..345aada59d 100644 --- a/app/views/event_import_files/edit.html.erb +++ b/app/views/event_import_files/edit.html.erb @@ -1,20 +1,20 @@
-

<%= t('page.editing', model: t('activerecord.models.event_import_file')) -%>

-
+

<%= t('page.editing', model: t('activerecord.models.event_import_file')) -%>

+
-<%= 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) -%> -
- <%= f.label :event_import_file_name -%>
- <%= f.text_field :event_import_file_name -%> -
-
- <%= f.submit %> -
-<%- end -%> +
+ <%= f.label :event_import_file_name -%>
+ <%= f.text_field :event_import_file_name -%> +
+
+ <%= f.submit %> +
+ <%- end -%> -
+
diff --git a/app/views/event_import_files/new.html.erb b/app/views/event_import_files/new.html.erb index e16588d5a5..6fb2e9cb88 100644 --- a/app/views/event_import_files/new.html.erb +++ b/app/views/event_import_files/new.html.erb @@ -1,56 +1,56 @@

<%= t('page.new', model: t('activerecord.models.event_import_file')) -%>

-
+
+ + <%= form_with(model: @event_import_file) do |f| -%> + <%= error_messages(@event_import_file) -%> + +
+ <%= f.label t('page.file') -%>
+ <%= f.file_field :event_import -%> +
+ +
+ <%= f.label :edit_mode -%>
+ <%= 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' %> +
+ +
+ <%= f.label :user_encoding -%>
+ <%= 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' %> +
+ +
+ <%= f.label :default_event_category_id -%> + <%= f.select(:default_event_category_id, @event_categories.collect{|e| [e.display_name.localize, e.id]}) -%>
+ <%= t('event_import_file.default_event_category') %> +
+ +
+ <%= f.label :default_library_id -%> + <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
+ <%= t('event_import_file.default_library') %> +
+ +
+ <%= f.hidden_field :mode, value: 'import' %> + <%= f.submit t('page.start_import') %> +
+ <%- end -%> -<%= form_for(@event_import_file, html: { multipart: true }) do |f| -%> - <%= error_messages(@event_import_file) -%> - -
- <%= f.label t('page.file') -%>
- <%= f.file_field :event_import -%> -
- -
- <%= f.label :edit_mode -%>
- <%= 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' %> -
- -
- <%= f.label :user_encoding -%>
- <%= 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' %> -
- -
- <%= f.label :default_event_category_id -%> - <%= f.select(:default_event_category_id, @event_categories.collect{|e| [e.display_name.localize, e.id]}) -%>
- <%= t('event_import_file.default_event_category') %>
- -
- <%= f.label :default_library_id -%> - <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
- <%= t('event_import_file.default_library') %> -
- -
- <%= f.hidden_field :mode, value: 'import' %> - <%= f.submit t('page.start_import') %> -
-<%- end -%> - -
diff --git a/app/views/languages/_form.html.erb b/app/views/languages/_form.html.erb index 33a585ffd4..807db55fa7 100644 --- 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) %>
<%= f.label :name %>:
- <%= @language.name %> + <%= language.name %>
diff --git a/app/views/languages/edit.html.erb b/app/views/languages/edit.html.erb index 21e4f19134..7c583bb198 100644 --- a/app/views/languages/edit.html.erb +++ b/app/views/languages/edit.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.editing', model: t('activerecord.models.language')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.editing', model: t('activerecord.models.language')) -%>

+
+ <%= render 'form', language: @language %> +
diff --git a/app/views/languages/new.html.erb b/app/views/languages/new.html.erb index 7f00229988..74db02f9fc 100644 --- a/app/views/languages/new.html.erb +++ b/app/views/languages/new.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.new', model: t('activerecord.models.language')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.new', model: t('activerecord.models.language')) -%>

+
+ <%= render 'form', language: @language %> +
diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb index af2615ea09..7722bc371f 100644 --- a/app/views/libraries/_form.html.erb +++ b/app/views/libraries/_form.html.erb @@ -1,6 +1,6 @@ <%= render 'page/required_field' %> -<%= form_for(@library) do |f| -%> - <%= error_messages(@library) %> +<%= form_with(model: library) do |f| -%> + <%= error_messages(library) %>
<%= f.label :name -%>
@@ -17,81 +17,81 @@ <%= f.text_area :display_name, class: 'resource_textarea' -%>
- <% unless @library.web? %> -
- <%= f.label :isil -%>
- <%= f.text_field :isil, class: 'resource_identifier' -%> -
- -
- <%= f.label t('activerecord.models.country') -%>
- <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%> -
- -
- <%= f.label :zip_code -%>
- <%= f.text_field :zip_code -%> -
- -
- <%= f.label :region -%>
- <%= f.text_area :region, class: 'resource_textarea' -%> -
- -
- <%= f.label :locality -%>
- <%= f.text_area :locality, class: 'resource_textarea' -%> -
- -
- <%= f.label :street -%>
- <%= f.text_area :street, class: 'resource_textarea' -%> -
- -
- <%= f.label :latitude -%>
- <%= f.text_field :latitude -%> -
- -
- <%= f.label :longitude -%>
- <%= f.text_field :longitude -%> -
- -
- <%= f.label :telephone_number_1 -%>
- <%= f.phone_field :telephone_number_1 -%> -
- -
- <%= f.label :telephone_number_2 -%>
- <%= f.phone_field :telephone_number_2 -%> -
- -
- <%= f.label :fax_number -%>
- <%= f.phone_field :fax_number -%> -
- -
- <%= f.label :call_number_rows -%>
- <%= f.text_field :call_number_rows, class: 'resource_integer' -%> -
- -
- <%= f.label :call_number_delimiter -%>
- <%= f.text_field :call_number_delimiter, class: 'resource_integer' -%> -
- -
- <%= f.label :opening_hour -%>
- <%= f.text_area :opening_hour, class: 'resource_textarea' -%> -
- -
- <%= f.label :note -%>
- <%= f.text_area :note, class: 'resource_textarea' -%> -
+ <% unless library.web? %> +
+ <%= f.label :isil -%>
+ <%= f.text_field :isil, class: 'resource_identifier' -%> +
+ +
+ <%= f.label t('activerecord.models.country') -%>
+ <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%> +
+ +
+ <%= f.label :zip_code -%>
+ <%= f.text_field :zip_code -%> +
+ +
+ <%= f.label :region -%>
+ <%= f.text_area :region, class: 'resource_textarea' -%> +
+ +
+ <%= f.label :locality -%>
+ <%= f.text_area :locality, class: 'resource_textarea' -%> +
+ +
+ <%= f.label :street -%>
+ <%= f.text_area :street, class: 'resource_textarea' -%> +
+ +
+ <%= f.label :latitude -%>
+ <%= f.text_field :latitude -%> +
+ +
+ <%= f.label :longitude -%>
+ <%= f.text_field :longitude -%> +
+ +
+ <%= f.label :telephone_number_1 -%>
+ <%= f.phone_field :telephone_number_1 -%> +
+ +
+ <%= f.label :telephone_number_2 -%>
+ <%= f.phone_field :telephone_number_2 -%> +
+ +
+ <%= f.label :fax_number -%>
+ <%= f.phone_field :fax_number -%> +
+ +
+ <%= f.label :call_number_rows -%>
+ <%= f.text_field :call_number_rows, class: 'resource_integer' -%> +
+ +
+ <%= f.label :call_number_delimiter -%>
+ <%= f.text_field :call_number_delimiter, class: 'resource_integer' -%> +
+ +
+ <%= f.label :opening_hour -%>
+ <%= f.text_area :opening_hour, class: 'resource_textarea' -%> +
+ +
+ <%= f.label :note -%>
+ <%= f.text_area :note, class: 'resource_textarea' -%> +
<% end %>
diff --git a/app/views/libraries/edit.html.erb b/app/views/libraries/edit.html.erb index 5f0d639876..7eceb0fb7e 100644 --- a/app/views/libraries/edit.html.erb +++ b/app/views/libraries/edit.html.erb @@ -1,7 +1,7 @@

<%= t('page.editing', model: t('activerecord.models.library')) -%>

- <%= render 'form' %> + <%= render 'form', library: @library %>
diff --git a/app/views/libraries/new.html.erb b/app/views/libraries/new.html.erb index 01b6bac1a1..aaf69baa3d 100644 --- a/app/views/libraries/new.html.erb +++ b/app/views/libraries/new.html.erb @@ -1,7 +1,7 @@

<%= t('page.new', model: t('activerecord.models.library')) -%>

- <%= render 'form' %> + <%= render 'form', library: @library %>
diff --git a/app/views/licenses/_form.html.erb b/app/views/licenses/_form.html.erb index 023a36f1e9..830cdcc276 100644 --- a/app/views/licenses/_form.html.erb +++ b/app/views/licenses/_form.html.erb @@ -1,5 +1,5 @@ -<%= form_for(@license) do |f| %> - <%= error_messages(@license) %> +<%= form_with(model: license) do |f| %> + <%= error_messages(license) %>
<%= f.label :name %>
diff --git a/app/views/licenses/edit.html.erb b/app/views/licenses/edit.html.erb index 83ed48431f..eabebc8ee6 100644 --- a/app/views/licenses/edit.html.erb +++ b/app/views/licenses/edit.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.editing', model: t('activerecord.models.license')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.editing', model: t('activerecord.models.license')) -%>

+
+ <%= render 'form', license: @license %> +
diff --git a/app/views/licenses/new.html.erb b/app/views/licenses/new.html.erb index 4595788104..ca16bf3373 100644 --- a/app/views/licenses/new.html.erb +++ b/app/views/licenses/new.html.erb @@ -1,8 +1,8 @@
-

<%= t('page.new', model: t('activerecord.models.license')) -%>

-
- <%= render 'form' %> -
+

<%= t('page.new', model: t('activerecord.models.license')) -%>

+
+ <%= render 'form', license: @license %> +
diff --git a/app/views/manifestations/_form.html.erb b/app/views/manifestations/_form.html.erb index 5a716b042b..cd4a00e741 100644 --- a/app/views/manifestations/_form.html.erb +++ b/app/views/manifestations/_form.html.erb @@ -1,5 +1,5 @@ <%= render 'page/required_field' %> -<%= form_for(@manifestation, html: { multipart: true }) do |f| -%> +<%= form_with(model: @manifestation) do |f| -%> <%= error_messages(@manifestation) -%> <% if @manifestation.original_manifestations.exists? or @parent %> diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb index 793c8390fd..2fee95188c 100644 --- a/app/views/messages/_form.html.erb +++ b/app/views/messages/_form.html.erb @@ -1,10 +1,10 @@ -<%= form_for(@message) do |f| %> - <% if @message.errors.any? %> +<%= form_with(model: message) do |f| %> + <% if message.errors.any? %>
-

<%= pluralize(@message.errors.count, "error") %> prohibited this message from being saved:

+

<%= pluralize(message.errors.count, "error") %> prohibited this message from being saved:

    - <% @message.errors.map(&:full_message).each do |msg| %> + <% message.errors.map(&:full_message).each do |msg| %>
  • <%= msg %>
    • <% end %>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index 8f7528800f..ef569a3de7 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -2,7 +2,7 @@

<%= t('page.editing', model: t('activerecord.models.message')) -%>

- <%= form_for(@message) do |f| -%> + <%= form_with(model: @message) do |f| -%> <%= error_messages(@message) -%>
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb index a459e2bf93..d2661fffeb 100644 --- a/app/views/messages/new.html.erb +++ b/app/views/messages/new.html.erb @@ -3,7 +3,7 @@
- <%= form_for(@message, url: messages_path) do |f| -%> + <%= form_with(model: @message) do |f| -%> <%= error_messages(@message) -%>
diff --git a/app/views/news_feeds/_form.html.erb b/app/views/news_feeds/_form.html.erb index b65de3c22b..7cbd9280d7 100644 --- a/app/views/news_feeds/_form.html.erb +++ b/app/views/news_feeds/_form.html.erb @@ -1,5 +1,5 @@ -<%= form_for(@news_feed) do |f| -%> - <%= error_messages(@news_feed) -%> +<%= form_with(model: news_feed) do |f| -%> + <%= error_messages(news_feed) -%>
<%= f.label t('activerecord.attributes.news_feed.title') -%>
diff --git a/app/views/news_feeds/edit.html.erb b/app/views/news_feeds/edit.html.erb index 98df4b4e5b..1a05b7c9e0 100644 --- a/app/views/news_feeds/edit.html.erb +++ b/app/views/news_feeds/edit.html.erb @@ -1,7 +1,7 @@

<%= t('page.editing', model: t('activerecord.models.news_feed')) -%>

- <%= render 'form' %> + <%= render 'form', news_feed: @news_feed %>
diff --git a/app/views/news_feeds/new.html.erb b/app/views/news_feeds/new.html.erb index 9c933e3cbe..6c4133fe84 100644 --- a/app/views/news_feeds/new.html.erb +++ b/app/views/news_feeds/new.html.erb @@ -1,7 +1,7 @@

<%= t('page.new', model: t('activerecord.models.news_feed')) -%>

- <%= render 'form' %> + <%= render 'form', news_feed: @news_feed %>
diff --git a/app/views/news_posts/_form.html.erb b/app/views/news_posts/_form.html.erb index 6925aeff40..3c444a222b 100644 --- a/app/views/news_posts/_form.html.erb +++ b/app/views/news_posts/_form.html.erb @@ -1,5 +1,5 @@ -<%= form_for(@news_post) do |f| -%> - <%= error_messages(@news_post) -%> +<%= form_with(model: news_post) do |f| -%> + <%= error_messages(news_post) -%>
<%= f.label t('activerecord.attributes.news_post.title') -%>
<%= f.text_field :title, required: true, class: 'resource_title' -%> @@ -15,7 +15,7 @@