From 90a8c263f5a94952e1537704ae27825aed4d6600 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Fri, 3 Apr 2020 23:51:56 +0200 Subject: [PATCH] Fixed labels in MeasurementRoutine form --- app/views/measurement_routines/_form.html.erb | 10 ++++++++-- app/views/measurement_routines/_show_form.html.erb | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/measurement_routines/_form.html.erb b/app/views/measurement_routines/_form.html.erb index 35ede9e..25b09a4 100644 --- a/app/views/measurement_routines/_form.html.erb +++ b/app/views/measurement_routines/_form.html.erb @@ -1,7 +1,13 @@
<%= fields_for 'measurement[routine_attributes]', @routine do |ff| %> <%= ff.hidden_field :id %> -

<%= ff.text_field :name, required: true, style: "width: 95%;" %>

-

<%= ff.text_area :description, cols: 40, rows: 3, style: "width: 95%;" %>

+

+ + <%= ff.text_field :name, required: true, style: "width: 95%;" %> +

+

+ + <%= ff.text_area :description, cols: 40, rows: 3, style: "width: 95%;" %> +

<% end %>
diff --git a/app/views/measurement_routines/_show_form.html.erb b/app/views/measurement_routines/_show_form.html.erb index 8d8ecaf..9b8038c 100644 --- a/app/views/measurement_routines/_show_form.html.erb +++ b/app/views/measurement_routines/_show_form.html.erb @@ -1,11 +1,11 @@
<%= fields_for 'measurement[routine_attributes]', @routine do |ff| %>

+ <%= ff.select :id, options_from_collection_for_select(@project.measurement_routines, :id, :name, @routine.id), - {label: :field_measurement_routine, required: true}, - autocomplete: 'off', + {required: true}, autocomplete: 'off', onchange: "var mr_id = $('#measurement_routine_attributes_id').val(); $.ajax({ url: '#{measurement_routine_path(id: :mr_id)}'.replace('mr_id', mr_id),