From 2db586b713add5b255e28ba2b744606759cd70b5 Mon Sep 17 00:00:00 2001
From: Marius BALTEANU <marius.balteanu@zitec.com>
Date: Mon, 21 Oct 2019 23:09:18 +0300
Subject: [PATCH 1/4] Fix display type in query form view

---
 app/helpers/queries_helper.rb    | 2 +-
 app/views/queries/_form.html.erb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 88fe08b50..5565eb7b0 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -124,7 +124,7 @@ module QueriesHelper
     tags = ''.html_safe
     query.available_display_types.each do |t|
       tags << radio_button_tag('display_type', t, @query.display_type == t, :id => "display_type_#{t}") +
-        content_tag('label', l(:"label_display_type_#{t}"), :for => "display_type_#{t}")
+        content_tag('label', l(:"label_display_type_#{t}"), :for => "display_type_#{t}", :class => "inline")
     end
     tags
   end
diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb
index 12a1d0202..953a296bc 100644
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -107,13 +107,13 @@ $(document).ready(function(){
 });
 
 $(function ($) {
-  $('#display_type').change(function (e) {
-    var option = $(e.target).val()
+  $('input[name=display_type]').change(function () {
+    var option = $('input[name=display_type]:checked').val();
     if (option == 'board') {
       $('fieldset#columns, fieldset#sort, p#default_columns, p#group_by').hide();
     } else {
       $('fieldset#columns, fieldset#sort, p#default_columns, p#group_by').show();
     }
-  }).change()
+  }).change();
 });
 <% end %>
-- 
2.22.0