cm-admin 1.5.46 → 1.5.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378d66935a7066199a4eeadb51b8b7a585c8e4dd0babec1ecb19638657fa3f22
-  data.tar.gz: 847b3efed1840bdca5a69778f009a80be5fa4a66c0c19d88ed5a214f79f71c25
+  metadata.gz: 57f4f569dd190c4beda6a88e60269f61170e1f4e57b84a4b8628bc5ffcee5590
+  data.tar.gz: 114732f4357071651829db26e0f6a9fed0fbc9bfc70f7ef269c01b17f344dd2b
 SHA512:
-  metadata.gz: 2826196f546388631dd501f71efd8c2ab2ba82e28c156ae7689c9b8334f53e51a7e50379cfbb9ca168ff2beb7c23da4b2a8b6e18a63745021a2b68f823cc7734
-  data.tar.gz: 657210656f5b832832fb26603768220fd4e09def454c969c41dff0025546ef1ac03d2efce531698205412327db965446e5a2b33eb1f8e683d20f4dd8a63deeaa
+  metadata.gz: 486c5bd7d7f3602d25df34ac7e62c0bd5a562ae34d4737f0f7787a3b64ec3f561fe60d550980c8e50962d176ff9bc4c8cfe69b2400ced3a8718f049cabe25bea
+  data.tar.gz: a8db47cc780c85b77ad7afe9f1e6a37da27362d56d134fd6f95d795032c7adbda6e863aa18f8fce711d065ae712f34891097889ccec79ace88c3847a04fb1a84

data/.gitignore

@@ -11,4 +11,5 @@ public/cm-admin-packs/
 # rspec failure tracking
 .rspec_status
 .rubocop-*
-.DS_Store
+**/.DS_Store
+.idea

data/Gemfile.lock

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

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

@@ -5,6 +5,7 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
   $(
     "." + form_class + " input.required, ." + form_class + " textarea.required",
   ).each(function () {
+    if($(this).attr('type') === 'file') return;
     $(this).removeClass("is-invalid");
     if ($(this).val().trim().length === 0) {
       $(this).addClass("is-invalid");

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.46'
+  VERSION = '1.5.47'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -11,8 +11,7 @@ module CmAdmin
                 else
                   form_obj.object.send(cm_field.field_name)
                 end
-        # value = cm_field.helper_method ? send(cm_field.helper_method, form_obj.object, cm_field.field_name) : form_obj.object.send(cm_field.field_name)
-        is_required = form_obj.object._validators[cm_field.field_name].map(&:kind).include?(:presence) if is_required.nil?
+        is_required = is_field_presence_validated?(form_obj, cm_field) if is_required.nil?
         required_class = is_required ? 'required' : ''
         target_action = @model.available_actions.select { |x| x.name == cm_field.target[:action_name].to_s }.first if cm_field.target.present?
         send("cm_#{cm_field.input_type}_field", form_obj, cm_field, value, required_class, target_action, cm_field.ajax_url)

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -106,7 +106,8 @@ module CmAdmin
 
       def set_form_field(resource, form_obj, field)
         return unless field.display_if.call(form_obj.object)
-        is_required = form_obj.object._validators[field.field_name].map(&:kind).include?(:presence)
+
+        is_required = is_field_presence_validated?(form_obj, field)
 
         content_tag(:div, class: field.col_size ? "col-#{field.col_size}" : 'col') do
           if field.input_type.eql?(:hidden)
@@ -173,6 +174,13 @@ module CmAdmin
 
         url + '?' + query_params.to_query unless query_params.empty?
       end
+
+      def is_field_presence_validated?(form_obj, field)
+        associated_field = form_obj.object.class.reflect_on_all_associations(:belongs_to).reject do |association|
+          association.options[:optional] || "#{association.name}_id" != field.field_name.to_s
+        end
+        form_obj.object._validators[field.field_name].map(&:kind).include?(:presence) || associated_field.present?
+      end
     end
   end
 end

metadata

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