cm-admin 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff4795451733611c79424a5a0ac4aaacd838b34c8d7aea5fdfe6cb127367a97
-  data.tar.gz: 4f856a769adc82e99b13a243973906ef387cb00fe892eec14422286f622e80b7
+  metadata.gz: 6f7069da141483288102690ee44cb4343f343822031103677ab598d0a5ccb0b1
+  data.tar.gz: 50aa27e800231369711bd021dbe17f7ad456b76bc935acee234be6eb87f636b0
 SHA512:
-  metadata.gz: faa21284eae53b8fe3a1834bf6a27d0820197e714da9e23d6243d14ed54d94db314260da3db6893dba3dff37ec1e8e377af27eb668a98fa5de513b94edb1c29f
-  data.tar.gz: ad2570287ad72e499c468e9006720022fe67d1a1f98d10ab60c88cbdeaccf0d1f6fd0c492f5141ad08b3de745bb2d1373797b6af1343b721fbdec121404e9fd8
+  metadata.gz: d6ed0804824162768e7edcd8156e58016760a038a1e4e018410b54caec4b197f7d79384e3c54383a5a977754a08b57818d86fdc2a41df596b0c2f74cb4a8bf57
+  data.tar.gz: f06e7efe409134da48d7fd95b3e741fa191cff10ae50ab18da19270653c7fccd316ce893d7fd91c4277deecade00ee2424ad808dd88e9a69e02397b0acfe4351

data/Gemfile.lock

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

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

@@ -214,9 +214,11 @@ var unhideClearFilterBtn = function(filterValue) {
   }
 }
 
+$(document).on('click', '[data-behaviour="select-option"] .cm-checkbox', function(e) {
+  $(this).prop('checked', !$(this).prop('checked'));
+})
 // Selecting options for single and multi select filters
 $(document).on('click', '[data-behaviour="select-option"]', function(e) {
-  debugger
   var filterType = $(this).data('filter-type')
   var filterColumn = $(this).data('db-column')
 

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

@@ -1,4 +1,4 @@
-$(document).on('click', '.form_submit', function (e) {
+$(document).on('click', '[data-behaviour="form_submit"]', function (e) {
   e.preventDefault();
   var submit = [];
   var form_class = $(this).data('form-class');
@@ -30,6 +30,6 @@ $(document).on('click', '.form_submit', function (e) {
   });
   if (submit.length === 0) {
     $('.' + form_class).submit();
-    return $('.form_submit').button('loading');
+    return $('[data-behaviour="form_submit"]').button('loading');
   }
 });

data/app/controllers/cm_admin/resource_controller.rb

@@ -323,6 +323,7 @@ module CmAdmin
           column_names << generate_nested_params(associated_field)
         end
       end
+      column_names += attachment_fields(table_name.to_s.classify.constantize)
       Hash[
         "#{table_name}_attributes",
         column_names
@@ -335,14 +336,7 @@ module CmAdmin
       }
       columns += @model.ar_model.stored_attributes.values.flatten
       permittable_fields = @model.additional_permitted_fields + columns.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }
-      permittable_fields += @model.ar_model.name.constantize.reflect_on_all_associations.map {|x|
-        next if x.options[:polymorphic]
-        if x.class.name.include?('HasOne')
-          x.name.to_s.gsub('_attachment', '').gsub('rich_text_', '').to_sym
-        elsif x.class.name.include?('HasMany')
-          Hash[x.name.to_s.gsub('_attachments', ''), []]
-        end
-      }.compact
+      permittable_fields += attachment_fields(@model.ar_model.name.constantize)
       nested_table_fields = get_nested_table_fields(@model.available_fields[:new])
       nested_table_fields += get_nested_table_fields(@model.available_fields[:edit])
       nested_fields = nested_table_fields.uniq.map {|nested_table_field|
@@ -358,5 +352,18 @@ module CmAdmin
 
       model_object.find(id)
     end
+
+    private
+    
+    def attachment_fields(model_object)
+      model_object.reflect_on_all_associations.map {|reflection|
+        next if reflection.options[:polymorphic]
+        if reflection.class.name.include?('HasOne')
+          reflection.name.to_s.gsub('_attachment', '').gsub('rich_text_', '').to_sym
+        elsif reflection.class.name.include?('HasMany')
+          Hash[reflection.name.to_s.gsub('_attachments', ''), []]
+        end
+      }.compact
+    end
   end
 end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -135,8 +135,7 @@ module CmAdmin
           end
           concat split_form_into_section(resource, form_obj, entities)
           concat tag.br
-           # TODO: form_submit class is used for JS functionality, Have to remove 
-          concat form_obj.submit 'Save', class: 'btn-cta form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
+          concat form_obj.submit 'Save', class: 'btn-cta', data: {behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails