Skip to content

Commit 4357d6c

Browse files
edwinthinksedwinthinks
committed
Fix step to migrating to contacts naming
1 parent d8fa236 commit 4357d6c

7 files changed

Lines changed: 76 additions & 65 deletions

File tree

‎app/helpers/partners_helper.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ def partial_display_name(partial)
3434
'attached_documents' => 'Additional Documents'
3535
}
3636

37+
# TODO: temporary change of name for the contacts partial before migration
38+
if partial == 'executive_director'
39+
return 'Contacts'
40+
end
41+
3742
custom_names[partial] || partial.humanize
3843
end
3944

‎app/models/partner.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ def agency_info
152152
end
153153

154154
def partials_to_show
155+
# Must migrate to change the partner_form_fields to say "contacts" instead of "executive_director"
155156
organization.partner_form_fields.presence || ALL_PARTIALS
156157
end
157158

‎app/views/partners/profiles/edit/_contacts.html.erb‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<section class="content">
2+
<div class="container-fluid">
3+
<div class="row">
4+
<div class="col-md-12">
5+
<div class="card">
6+
<div class="card-header bg-white">
7+
<h3 class="card-title"><strong>Executive Director</strong></h3>
8+
</div>
9+
<div class="card-body">
10+
<%= form.input :executive_director_name, label: "Executive Director Name", class: "form-control", wrapper: :input_group %>
11+
<%= form.input :executive_director_phone, label: "Executive Director Phone", class: "form-control", wrapper: :input_group %>
12+
<%= form.input :executive_director_email, label: "Executive Director Email", class: "form-control", wrapper: :input_group %>
13+
</div>
14+
</div>
15+
</div>
16+
</div>
17+
</div>
18+
</section>
19+
20+
<section class="content">
21+
<div class="container-fluid">
22+
<div class="row">
23+
<div class="col-md-12">
24+
<div class="card">
25+
<div class="card-header bg-white">
26+
<h3 class="card-title"><strong>Primary Contact</strong></h3>
27+
</div>
28+
<div class="card-body">
29+
<%= form.input :primary_contact_name, label: "Primary Contact Name", class: "form-control", wrapper: :input_group %>
30+
<%= form.input :primary_contact_phone, label: "Primary Contact Phone", class: "form-control", wrapper: :input_group %>
31+
<%= form.input :primary_contact_mobile, label: "Primary Contact Cell", class: "form-control", wrapper: :input_group %>
32+
<%= form.input :primary_contact_email, label: "Primary Contact Email", class: "form-control", wrapper: :input_group %>
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
</div>
38+
</section>

‎app/views/partners/profiles/edit/_executive_director.html.erb‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,2 @@
1-
<section class="content">
2-
<div class="container-fluid">
3-
<div class="row">
4-
<div class="col-md-12">
5-
<div class="card">
6-
<div class="card-header bg-white">
7-
<h3 class="card-title"><strong>Executive Director</strong></h3>
8-
</div>
9-
<div class="card-body">
10-
<%= form.input :executive_director_name, label: "Executive Director Name", class: "form-control", wrapper: :input_group %>
11-
<%= form.input :executive_director_phone, label: "Executive Director Phone", class: "form-control", wrapper: :input_group %>
12-
<%= form.input :executive_director_email, label: "Executive Director Email", class: "form-control", wrapper: :input_group %>
13-
</div>
14-
</div>
15-
</div>
16-
</div>
17-
</div>
18-
</section>
19-
20-
<section class="content">
21-
<div class="container-fluid">
22-
<div class="row">
23-
<div class="col-md-12">
24-
<div class="card">
25-
<div class="card-header bg-white">
26-
<h3 class="card-title"><strong>Primary Contact</strong></h3>
27-
</div>
28-
<div class="card-body">
29-
<%= form.input :primary_contact_name, label: "Primary Contact Name", class: "form-control", wrapper: :input_group %>
30-
<%= form.input :primary_contact_phone, label: "Primary Contact Phone", class: "form-control", wrapper: :input_group %>
31-
<%= form.input :primary_contact_mobile, label: "Primary Contact Cell", class: "form-control", wrapper: :input_group %>
32-
<%= form.input :primary_contact_email, label: "Primary Contact Email", class: "form-control", wrapper: :input_group %>
33-
</div>
34-
</div>
35-
</div>
36-
</div>
37-
</div>
38-
</section>
1+
<% # TODO: remove this after migration to the other partials %>
2+
<%= render "partners/profiles/edit/contacts", form: form %>

‎app/views/partners/profiles/step/_contacts_form.html.erb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<%= f.fields_for :profile, profile do |pf| %>
2+
<div class="form-group">
3+
<%= pf.input :executive_director_name, label: "Executive Director Name", class: "form-control" %>
4+
</div>
5+
<div class="form-group">
6+
<%= pf.input :executive_director_phone, label: "Executive Director Phone", class: "form-control" %>
7+
</div>
8+
<div class="form-group">
9+
<%= pf.input :executive_director_email, label: "Executive Director Email", class: "form-control" %>
10+
</div>
11+
12+
<h3 class="pt-3"><strong>Primary Contact</strong></h3>
13+
14+
<div class="form-group">
15+
<%= pf.input :primary_contact_name, label: "Primary Contact Name", class: "form-control" %>
16+
</div>
17+
<div class="form-group">
18+
<%= pf.input :primary_contact_phone, label: "Primary Contact Phone", class: "form-control" %>
19+
</div>
20+
<div class="form-group">
21+
<%= pf.input :primary_contact_mobile, label: "Primary Contact Cell", class: "form-control" %>
22+
</div>
23+
<div class="form-group">
24+
<%= pf.input :primary_contact_email, label: "Primary Contact Email", class: "form-control" %>
25+
</div>
26+
<% end %>

‎app/views/partners/profiles/step/_executive_director_form.html.erb‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
<%= f.fields_for :profile, profile do |pf| %>
2-
<div class="form-group">
3-
<%= pf.input :executive_director_name, label: "Executive Director Name", class: "form-control" %>
4-
</div>
5-
<div class="form-group">
6-
<%= pf.input :executive_director_phone, label: "Executive Director Phone", class: "form-control" %>
7-
</div>
8-
<div class="form-group">
9-
<%= pf.input :executive_director_email, label: "Executive Director Email", class: "form-control" %>
10-
</div>
11-
12-
<h3 class="pt-3"><strong>Primary Contact</strong></h3>
13-
14-
<div class="form-group">
15-
<%= pf.input :primary_contact_name, label: "Primary Contact Name", class: "form-control" %>
16-
</div>
17-
<div class="form-group">
18-
<%= pf.input :primary_contact_phone, label: "Primary Contact Phone", class: "form-control" %>
19-
</div>
20-
<div class="form-group">
21-
<%= pf.input :primary_contact_mobile, label: "Primary Contact Cell", class: "form-control" %>
22-
</div>
23-
<div class="form-group">
24-
<%= pf.input :primary_contact_email, label: "Primary Contact Email", class: "form-control" %>
25-
</div>
26-
<% end %>
1+
<%= render "partners/profiles/step/contacts_form", f: f, profile: profile %>

‎app/views/profiles/step/edit.html.erb‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
<%= render 'partners/profiles/step/accordion_section', f: f, partner: @partner, section_id: 'agency_information', section_title: 'Agency Information', icon_class: 'fa-edit', partial_name: 'agency_information', sections_with_errors: @sections_with_errors %>
2727
<%= render 'partners/profiles/step/accordion_section', f: f, partner: @partner, section_id: 'program_delivery_address', section_title: 'Program / Delivery Address', icon_class: 'fa-map', partial_name: 'program_delivery_address', sections_with_errors: @sections_with_errors %>
2828
<% @partner.partials_to_show.each do |partial| %>
29-
<%= render 'partners/profiles/step/accordion_section', f: f, partner: @partner, section_id: partial, section_title: partial_display_name(partial), icon_class: 'fa-cogs', partial_name: partial, sections_with_errors: @sections_with_errors %>
29+
<%= render 'partners/profiles/step/accordion_section', f: f, partner: @partner, section_id: partial, section_title: partial_display_name(partial), icon_class: 'fa-cogs',
30+
partial_name: partial,
31+
sections_with_errors: @sections_with_errors %>
3032
<% end %>
3133
<%= render 'partners/profiles/step/accordion_section', f: f, partner: @partner, section_id: 'partner_settings', section_title: 'Settings', icon_class: 'fa-cog', partial_name: 'partner_settings', sections_with_errors: @sections_with_errors %>
3234
</div>

0 commit comments

Comments
 (0)