From fff5673ec0e825731c6864bb8a4819027170b195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 8 Jan 2019 20:28:09 +0100 Subject: [PATCH] Simplify hiding/showing progress bar type field With a parent element for just input and label, there aren't conflicts with the globalize tabs code anymore. --- app/assets/javascripts/forms.js.coffee | 4 ++-- app/views/admin/progress_bars/_form.html.erb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/forms.js.coffee b/app/assets/javascripts/forms.js.coffee index 25fd2d5fd..aa7c4818f 100644 --- a/app/assets/javascripts/forms.js.coffee +++ b/app/assets/javascripts/forms.js.coffee @@ -34,9 +34,9 @@ App.Forms = title_field = $("[name^='progress_bar'][name$='[title]']").parent() if this.value == "primary" - title_field.addClass("hide") + title_field.hide() else - title_field.removeClass("hide") + title_field.show() $("[name='progress_bar[kind]']").change() diff --git a/app/views/admin/progress_bars/_form.html.erb b/app/views/admin/progress_bars/_form.html.erb index f4ed45493..cdc6af59e 100644 --- a/app/views/admin/progress_bars/_form.html.erb +++ b/app/views/admin/progress_bars/_form.html.erb @@ -6,11 +6,11 @@ <%= f.enum_select :kind %> -
- <%= f.translatable_fields do |translations_form| %> + <%= f.translatable_fields do |translations_form| %> +
<%= translations_form.text_field :title %> - <% end %> -
+
+ <% end %> <% progress_options = { min: ProgressBar::RANGE.min, max: ProgressBar::RANGE.max, step: 1 } %>