cm-admin 1.5.41 → 1.5.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64d865b82c2abfd0975930a349a1ba2f63ee85d5ecbf0a4e627d3cbc1629bb1
-  data.tar.gz: 5ce41edd98628d3b20315a5ca44c5be95daf578bbdd53c97192f114f58110545
+  metadata.gz: 25d1608feb2a0f90e9e8e8202d8898e511a1e1bbb4bc463e0a327190eeedb27a
+  data.tar.gz: 7a2ccc290b1545db664634cb915f81a8dca27630c024e38cbbb9fbf1898cee72
 SHA512:
-  metadata.gz: 7327d73ee5028535163d62e4f3dbc7197389132178331c9bf76e4e0bb463166a06fb74186c4c32c0a50871c37ead0895e7f4b43157646bb3a5ff59b3e5e7e207
-  data.tar.gz: fefcc76ae24e4cc066c9dc70831fa5f1974bfe03563c49863e319180adec9577eb0dcb6acae9a4d35d4b587a7a2b602d3a09e0cab4c4b03ae8eac1e12eddd286
+  metadata.gz: 15783cf2216b6390a976eeacc314f5a89b0b696ee777648c2e8bcd9e58fff27e625b1b5f29336d0ac31327833e148b5fb8c563b984df79e1e8d5c321ba27b23a
+  data.tar.gz: 2d3672c631061c354c3e2b72589ceb8b4e5d42f81b3efd9eed9f8b55a743336d434c4ea826bd3a66c3befb11bc770a8c647ddf879c9b86fa1c10296f4c2d265f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.5.41)
+    cm-admin (1.5.42)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/app/assets/javascripts/cm_admin/filters.js

@@ -42,9 +42,8 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null) {
   // Generate the queryString by concatenating the filterParams and
   // searchParams that are already applied, if searchParams are present.
   var searchParams = window.location.search
-  var searchParamshash = getParamsAsObject(searchParams)
-  var tempsearchParamshash = delete searchParamshash['page']
-  if (tempsearchParamshash.length > 0) {
+  var searchParamsHash = getParamsAsObject(searchParams)
+  if (Object.keys(searchParamsHash).length > 0) {
     // Delete the previous applied value for multi_select filter from the
     // searchParams as altering the array with new and old value will create
     // more complicated logic. The new value is passed and structured in

data/app/assets/javascripts/cm_admin/form_validation.js

@@ -41,13 +41,3 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
     return $('[data-behaviour="form_submit"]').button("loading");
   }
 });
-
-$(document).on("change", '[data-behaviour="multiple-checkbox"]', function (e) {
-  const inputField = e.target.previousElementSibling;
-
-  if (e.target.checked) {
-    inputField.setAttribute("disabled", "disabled");
-  } else {
-    inputField.removeAttribute("disabled");
-  }
-});

data/lib/cm_admin/models/form_field.rb

@@ -9,7 +9,7 @@ module CmAdmin
                     :placeholder, :display_if, :html_attrs, :target, :col_size, :ajax_url, :helper_text
 
       VALID_INPUT_TYPES = %i[
-        integer decimal string single_select multi_select date date_time text switch custom_single_select
+        integer decimal string single_select multi_select date date_time text switch custom_single_select checkbox_group
         single_file_upload multi_file_upload hidden rich_text check_box radio_button custom_string custom_date
       ].freeze
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.41'
+  VERSION = '1.5.42'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -57,15 +57,15 @@ module CmAdmin
       def cm_switch_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)\
         content_tag :div, class: 'form-check form-switch' do
           concat form_obj.check_box cm_field.field_name,
-                             merge_wrapper_options(
-                               {
-                                 class: "field-control form-check-input #{required_class}",
-                                 disabled: cm_field.disabled.call(form_obj.object),
-                                 value:,
-                                 role: 'switch'
-                               }, cm_field.html_attrs
-                             )
-            concat content_tag(:div, cm_field.field_name.to_s.titleize, class: 'cm-switch-label')
+                                    merge_wrapper_options(
+                                      {
+                                        class: "field-control form-check-input #{required_class}",
+                                        disabled: cm_field.disabled.call(form_obj.object),
+                                        value:,
+                                        role: 'switch'
+                                      }, cm_field.html_attrs
+                                    )
+          concat content_tag(:div, cm_field.label, class: 'cm-switch-label')
         end
       end
 
@@ -239,12 +239,42 @@ module CmAdmin
         end
       end
 
-      def cm_check_box_field(form_obj, cm_field, value, required_class, target_action, _ajax_url)
-        format_check_box_options(value, form_obj, cm_field, required_class, target_action)
+      def cm_check_box_field(form_obj, cm_field, _value, required_class, target_action, _ajax_url)
+        content_tag :div, class: 'form-check' do
+          concat form_obj.check_box cm_field.field_name,
+                                    merge_wrapper_options(
+                                      {
+                                        class: "form-check-input #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                                        disabled: cm_field.disabled.call(form_obj.object),
+                                        data: {
+                                          field_name: cm_field.field_name,
+                                          target_action: target_action&.name,
+                                          target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : ''
+                                        }
+                                      }, cm_field.html_attrs
+                                    )
+          concat content_tag(:div, cm_field.label, class: 'cm-checkbox-label')
+        end
+      end
+
+      def cm_checkbox_group_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
+        original_value = form_obj.object.send(cm_field.field_name)
+        content_tag :div do
+          concat form_obj.text_field cm_field.field_name, name: "#{@model.name.underscore}[#{cm_field.field_name}][]",
+                                                          value: nil, hidden: true
+          value.each do |key, val|
+            is_checked = original_value.include?(val)
+            concat format_check_box(val || key, key, form_obj, cm_field, required_class, is_checked)
+          end
+        end
       end
 
-      def cm_radio_button_field(form_obj, _cm_field, value, _required_class, _target_action, _ajax_url)
-        format_radio_button_options(value, form_obj)
+      def cm_radio_button_field(form_obj, cm_field, value, _required_class, _target_action, _ajax_url)
+        content_tag :div do
+          value.each do |key, val|
+            concat format_radio_option(val || key, key, cm_field, form_obj)
+          end
+        end
       end
 
       def cm_hidden_field(form_obj, cm_field, value, _required_class, _target_action, _ajax_url)
@@ -269,89 +299,23 @@ module CmAdmin
         end
       end
 
-      def format_check_box_options(value, form_obj, cm_field, required_class, target_action)
-        if value.instance_of?(Array)
-          format_check_box_array(value, form_obj, cm_field, required_class, target_action)
-        else
-          content_tag :div, class: 'cm-checkbox-section' do
-            concat single_checkbox_tag(value, form_obj, cm_field, required_class, target_action)
-            concat content_tag(:div, cm_field.field_name.to_s.titleize, class: 'cm-checkbox-label')
-          end
-        end
-      end
-
-      def format_check_box_array(options, form_obj, cm_field, required_class, target_action)
-        content_tag :div do
-          options.each do |key, val|
-            concat format_check_box(val, key, form_obj, cm_field, required_class, target_action)
-          end
-        end
-      end
-
-      def format_check_box(val, key, form_obj, cm_field, required_class, target_action)
-        content_tag :div, class: 'cm-checkbox-section' do
-          concat format_check_box_tag(val, form_obj, cm_field, required_class, target_action)
-          concat content_tag(:div, key, class: 'cm-checkbox-label')
-        end
-      end
-
-      def single_checkbox_tag(value, form_obj, cm_field, required_class, target_action)
-        content_tag :div, class: 'cm-checkbox-tag' do
-          concat form_obj.check_box cm_field.field_name,
-                         merge_wrapper_options(
-                           {
-                             class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
-                             disabled: cm_field.disabled.call(form_obj.object),
-                             data: {
-                               field_name: cm_field.field_name,
-                               target_action: target_action&.name,
-                               target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : ''
-                             }
-                           }, cm_field.html_attrs
-                         )
-        end
-      end
-
-      def format_check_box_tag(val, form_obj, cm_field, required_class, target_action)
-        content_tag :div, class: 'cm-checkbox-tag' do
-          if val.present?
-            concat form_obj.text_field cm_field.field_name, name: "#{@model.name.underscore}[#{cm_field.field_name}][]", value: '0', hidden: true, disabled: 'disabled'
-          else
-            concat form_obj.text_field cm_field.field_name, name: "#{@model.name.underscore}[#{cm_field.field_name}][]", value: '0', hidden: true
-          end
-          concat check_box_tag "#{@model.name.underscore}[#{cm_field.field_name}][]", '1', val,
+      def format_check_box(val, key, form_obj, cm_field, required_class, is_checked)
+        content_tag :div, class: 'form-check' do
+          concat check_box_tag "#{@model.name.underscore}[#{cm_field.field_name}][]", val, is_checked,
                                merge_wrapper_options(
                                  {
-                                   class: "cm-checkbox multiple-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
-                                   disabled: cm_field.disabled.call(form_obj.object),
-                                   data: {
-                                     behaviour: 'multiple-checkbox',
-                                     target_action: target_action&.name,
-                                     target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path", ':param_1') : ''
-                                   }
+                                   class: "form-check-input #{required_class}",
+                                   disabled: cm_field.disabled.call(form_obj.object)
                                  }, cm_field.html_attrs
                                )
+          concat content_tag(:div, key, class: 'cm-checkbox-label')
         end
       end
 
-      def format_radio_button_options(options, form_obj)
-        content_tag :div do
-          options.each do |val, key|
-            concat format_radio_option(val, key, form_obj)
-          end
-        end
-      end
-
-      def format_radio_option(val, key, form_obj)
-        content_tag :div, class: 'cm-radio-section' do
-          concat format_radio_button(val, form_obj)
-          concat content_tag(:div, key, class: 'cm-radio-label')
-        end
-      end
-
-      def format_radio_button(val, form_obj)
-        content_tag :div, class: 'cm-radio-tag' do
-          concat form_obj.radio_button :level, val, class: 'field-control cm-radio'
+      def format_radio_option(val, key, cm_field, form_obj)
+        content_tag :div, class: 'form-check' do
+          concat form_obj.radio_button cm_field.field_name, val, merge_wrapper_options({ class: 'form-check-input' }, cm_field.html_attrs)
+          concat content_tag(:div, key, class: 'form-check-label')
         end
       end
 

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -112,7 +112,7 @@ module CmAdmin
             concat input_field_for_column(form_obj, field)
           else
             concat(content_tag(:div, class: "form-field #{field.disabled ? 'disabled' : ''}") do
-              if field.label
+              if field.label && %i[check_box switch].exclude?(field.input_type)
                 concat form_obj.label field.label, field.label, class: 'field-label'
                 concat tag.br
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.41
+  version: 1.5.42
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails