From 6d62caa96afad2bc67598a3a3c96b0db4ccedd5f Mon Sep 17 00:00:00 2001 From: bilal Date: Thu, 11 Jun 2020 18:40:39 +0200 Subject: [PATCH] add required label to all location release fields --- .../public/location_releases/new.html.erb | 22 +++++++++---------- app/views/shared/_address_fields.html.erb | 9 ++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/views/public/location_releases/new.html.erb b/app/views/public/location_releases/new.html.erb index b93ffa0..d9855a1 100644 --- a/app/views/public/location_releases/new.html.erb +++ b/app/views/public/location_releases/new.html.erb @@ -17,21 +17,21 @@
<%= form.text_field :name, required: true, wrapper_class: "col-12" %>
- <%= render "shared/address_fields", form: form, subject: "" %> + <%= render "shared/address_fields", form: form, subject: "", required: true %> <% end %>
<%= card_field_set_tag t(".contact_info.heading") do %>
- <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %> - <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %> - <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %> - <%= form.email_field :person_email, wrapper_class: "col-sm-6" %> - <%= form.text_field :person_company, wrapper_class: "col-sm-6" %> - <%= form.text_field :person_title, wrapper_class: "col-sm-6" %> + <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-6" %> + <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-6" %> + <%= form.phone_field :person_phone, required: true, wrapper_class: "col-sm-6" %> + <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %> + <%= form.text_field :person_company, required: true, wrapper_class: "col-sm-6" %> + <%= form.text_field :person_title, required: true, wrapper_class: "col-sm-6" %>
- <%= render "shared/address_fields", form: form, subject: "person" %> + <%= render "shared/address_fields", form: form, subject: "person", required: true %> <% end %>
@@ -39,9 +39,9 @@ <%= card_field_set_tag t(".filming_info.heading") do %>
- <%= form.text_field :filming_started_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %> - <%= form.text_field :filming_ended_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %> - <%= form.text_field :filming_hours, wrapper_class: "col-sm-12" %> + <%= form.text_field :filming_started_on, required: true, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %> + <%= form.text_field :filming_ended_on, required: true, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %> + <%= form.text_field :filming_hours, required: true, wrapper_class: "col-sm-12" %>
<% end %> diff --git a/app/views/shared/_address_fields.html.erb b/app/views/shared/_address_fields.html.erb index 6346517..51cda48 100644 --- a/app/views/shared/_address_fields.html.erb +++ b/app/views/shared/_address_fields.html.erb @@ -1,13 +1,14 @@ <% field_name_prefix = subject.present? ? "#{subject}_" : "" %> +<% required = required || false %>
- <%= 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" %>
- <%= 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" %>
<%= form.form_group "#{field_name_prefix}address_country" do %> <%= form.label "#{field_name_prefix}address_country" %>