senaduka/old-holivud2
1
0
Fork 0
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Destructure appearance release person and guardian address fields public form #21

Closed
bilal.catic wants to merge 16 commits from destructure-appearance-release-person-and-guardian-address-fields-public-form into master
pull from: destructure-appearance-release-person-and-guardian-address-fields-public-form
merge into: senaduka:master
Conversation 4 Commits 16 Files Changed 18 +7 -6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba0043206a - Show all commits

4
app/views/public/appearance_releases/new.html.erb
View File

@@ -36,7 +36,7 @@
<%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %>
<%= form.date_field :person_date_of_birth, required: true, wrapper_class: "col-sm-6", placeholder: Date.current %>
</div>
<%= render "shared/address_fields", form: form, subject: "person" %>
<%= render "shared/address_fields", form: form, subject: "person", required: true %>
<% end %>
<%= card_field_set_tag t(".photo.heading") do %>
@@ -79,7 +79,7 @@
<div class="form-row">
<%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
</div>
<%= render "shared/address_fields", form: form, subject: "guardian" %>
<%= render "shared/address_fields", form: form, subject: "guardian", required: true %>
<% end %>
<hr>

9
app/views/shared/_address_fields.html.erb
View File

@@ -1,13 +1,14 @@
<% field_name_prefix = subject.present? ? "#{subject}_" : "" %>
<% required = required || false %>
<div class="form-row">
<%= form.text_field "#{field_name_prefix}address_street1", wrapper_class: "col-sm-6" %>
<%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6" %>
<%= form.text_field "#{field_name_prefix}address_street2", wrapper_class: "col-sm-6" %>
</div>
<div class="form-row">
<%= form.text_field "#{field_name_prefix}address_city", wrapper_class: "col-sm-6" %>
<%= form.text_field "#{field_name_prefix}address_state", wrapper_class: "col-sm-3" %>
<%= form.text_field "#{field_name_prefix}address_zip", wrapper_class: "col-sm-3" %>
<%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6" %>
<%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3" %>
<%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3" %>
</div>
<%= form.form_group "#{field_name_prefix}address_country" do %>
<%= form.label "#{field_name_prefix}address_country" %>