Skip to content

Commit 2f75543

Browse files
authored
Merge pull request #6528 from AudTheCodeWitch/acook/5576/update-soft-deprecated-form-helpers
Refactor: Update soft-deprecated form helpers #5576
2 parents 02f03ef + 97f64e9 commit 2f75543

File tree

22 files changed

+29
-31
lines changed

22 files changed

+29
-31
lines changed

app/views/all_casa_admins/casa_admins/_form.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= form_for casa_admin, url: all_casa_admins_casa_org_casa_admins_path(casa_org), id: :new_casa_admin do |form| %>
1+
<%= form_with(model: casa_admin, url: all_casa_admins_casa_org_casa_admins_path(casa_org), id: :new_casa_admin) do |form| %>
22
<%= render "/shared/error_messages", resource: casa_admin %>
33
<div class="input-style-1">
44
<%= form.label :email, "Email" %>

app/views/all_casa_admins/casa_admins/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<%= render 'layouts/flash_messages' %>
77
<div class="card-style">
88
<div class="card-body">
9-
<%= form_for @casa_admin, as: :all_casa_admin, url: all_casa_admins_casa_org_casa_admin_path do |form| %>
9+
<%= form_with(model: @casa_admin, as: :all_casa_admin, url: all_casa_admins_casa_org_casa_admin_path) do |form| %>
1010
<%= render "/shared/error_messages", resource: @casa_admin %>
1111

1212
<div class="input-style-1">

app/views/all_casa_admins/edit.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<div class="card-style">
88
<div class="card-body">
9-
<%= form_for @user, as: :all_casa_admin, url: all_casa_admins_path do |form| %>
9+
<%= form_with(model: @user, scope: :all_casa_admin, url: all_casa_admins_path, method: :patch) do |form| %>
1010

1111
<%= render "/shared/error_messages", resource: @user %>
1212

@@ -26,7 +26,7 @@
2626
<% end %>
2727
<br>
2828
<div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
29-
<%= form_for(@user, as: :all_casa_admin, url: {action: "update_password"}) do |f| %>
29+
<%= form_with(model: @user, scope: :all_casa_admin, url: {action: "update_password"}, method: :patch) do |f| %>
3030
<div class="input-style-1">
3131
<%= f.label :password, "Password" %><br>
3232
<%= f.password_field :password, autocomplete: "off", class: "form-control", minlength: 6 %>

app/views/all_casa_admins/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<div class="card card-container">
88
<div class="card-body">
9-
<%= form_for @all_casa_admin, as: :all_casa_admin, url: all_casa_admins_path do |form| %>
9+
<%= form_with(model: @all_casa_admin, as: :all_casa_admin, url: all_casa_admins_path) do |form| %>
1010
<%= render "/shared/error_messages", resource: @all_casa_admin %>
1111

1212
<div class="input-style-1">

app/views/all_casa_admins/passwords/new.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<h1>Forgot your password?</h1>
88
<br>
99

10-
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: {method: :post}) do |f| %>
10+
<%= form_with(model: resource, as: resource_name, url: password_path(resource_name), method: :post) do |f| %>
1111
<%= render "/shared/error_messages", resource: resource %>
1212

13-
<h4>Please enter email or phone number to recieve reset instructions.</h4>
13+
<h4>Please enter email or phone number to receive reset instructions.</h4>
1414

1515
<div class="field form-group">
1616
<%= f.label :email %><br>

app/views/all_casa_admins/sessions/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<h2 class="mb-15">All CASA Log In</h2>
88
<br>
99
<%= render "layouts/flash_messages" %>
10-
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
10+
<%= form_with(model: resource, as: resource_name, url: session_path(resource_name)) do |f| %>
1111
<div class="input-style-1">
1212
<%= f.label :email %>
1313
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control", required: true %>

app/views/case_assignments/index.html.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
<div class="col-sm-6">
4141
<h3>Assign a New Volunteer</h3>
4242

43-
<%= form_for CaseAssignment.new, url: volunteer_case_assignments_path do |form| %>
44-
43+
<%= form_with(model: CaseAssignment.new, url: volunteer_case_assignments_path) do |form| %>
4544
<div class='form-group'>
4645
<label for="case_assignment_casa_case_id">Select a Case</label>
4746
<select id="is-this-used-anywhere" class='form-control select2'>
@@ -50,7 +49,6 @@
5049
<% end %>
5150
</select>
5251
</div>
53-
5452
<%= form.submit "Assign Case", class: 'btn btn-primary' %>
5553
<% end %>
5654
</div>

app/views/devise/invitations/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="password-box px-4 pb-3">
22
<h2 class="my-3">Send invitation</h2>
33

4-
<%= form_for(resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put}) do |f| %>
4+
<%= form_with(model: resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put}) do |f| %>
55
<%= render "/shared/error_messages", resource: resource %>
66
<%= f.hidden_field :invitation_token, readonly: true %>
77

app/views/devise/invitations/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="row p-3">
22
<h2 class="mb-2">Send invitation</h2>
33

4-
<%= form_for(resource, as: resource_name, url: invitation_path(resource_name), html: {method: :post}) do |f| %>
4+
<%= form_with(model: resource, as: resource_name, url: invitation_path(resource_name), html: {method: :post}) do |f| %>
55
<%= render "/shared/error_messages", resource: resource %>
66

77
<% resource.class.invite_key_fields.each do |field| -%>

app/views/devise/passwords/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="offset-xl-2 col-xl-8 col-lg-12 col-sm-8 col-md-8 pb-4">
66
<h2 class="my-4">Change your password</h2>
77

8-
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: {method: :put}) do |f| %>
8+
<%= form_with(model: resource, as: resource_name, url: password_path(resource_name), method: :put) do |f| %>
99
<%= render "/shared/error_messages", resource: resource %>
1010
<%= f.hidden_field :reset_password_token %>
1111

0 commit comments

Comments
 (0)