cm-admin 1.5.43 → 1.5.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6509d5116d77ebcd171e7e275bc232ba5c71005e691be6f2c521361c9da59657
-  data.tar.gz: a2128a5de7729038142f0113ec58a6b16d078b8f6e9c873c79e5d61608069c0a
+  metadata.gz: 063a8dffa41719953d125e6fddb24a3e59f3869ba6a82da090b50aaee5a0d495
+  data.tar.gz: 470c4ffbeff36d4bdbc77af410430b5861eac385b5848536d4796eaa480a4a9f
 SHA512:
-  metadata.gz: 6ce0be645a8f5482e8fee8df86df9e14bb167eaa6b3b5df2b83667f28220d709c2e6485f24761ab10a6984b64ec7fef864de85dd26584d51464d71f71632ee66
-  data.tar.gz: 413054c73b47eb76b5f76af7d15bba7013b075f104fb895d19e9a9e01d46a036033ddae82461ffa4df5d0d41d699fe96ecf663f07a89fb120ab1dc796d540a59
+  metadata.gz: a3e2798dcfc91f39751010f3956d033ceb852a23ab3bc0b0b992d8f64c2679cb3330385055c519c719083e3c7ee9b5c911abd2cbff8a879205caad2e4eb8b415
+  data.tar.gz: 393ebc8dd097f9b06f837289e86dba708cce6e21721050354fffeb5732b32e6bfd8cc8229df82aec6bca2a8d0ff5285eff1d254f0f5f4dfdbb251fd9fc450e4f

data/Gemfile.lock

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

data/app/assets/stylesheets/cm_admin/base/form.scss

@@ -42,6 +42,10 @@
 
 .field-label {
   @extend .form-label;
+  &.required-label::after {
+    content: " *";
+    color: $red;
+  }
 }
 
 .field-control {

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.43'
+  VERSION = '1.5.44'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -1,7 +1,7 @@
 module CmAdmin
   module ViewHelpers
     module FormFieldHelper
-      def input_field_for_column(form_obj, cm_field)
+      def input_field_for_column(form_obj, cm_field, is_required: nil)
         return unless cm_field.display_if.call(form_obj.object)
 
         value = if cm_field.helper_method
@@ -12,7 +12,7 @@ module CmAdmin
                   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)
+        is_required = form_obj.object._validators[cm_field.field_name].map(&:kind).include?(:presence) 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,17 +106,18 @@ 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)
 
         content_tag(:div, class: field.col_size ? "col-#{field.col_size}" : 'col') do
           if field.input_type.eql?(:hidden)
-            concat input_field_for_column(form_obj, field)
+            concat input_field_for_column(form_obj, field, is_required:)
           else
             concat(content_tag(:div, class: "form-field #{field.disabled ? 'disabled' : ''}") do
               if field.label && %i[check_box switch].exclude?(field.input_type)
-                concat form_obj.label field.label, field.label, class: 'field-label'
+                concat form_obj.label field.label, field.label, class: "field-label #{is_required ? 'required-label' : ''}"
                 concat tag.br
               end
-              concat input_field_for_column(form_obj, field)
+              concat input_field_for_column(form_obj, field, is_required:)
               concat tag.small field.helper_text, class: 'form-text text-muted' if field.helper_text.present?
               concat tag.p resource.errors[field.field_name].first if resource.errors[field.field_name].present?
             end)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.43
+  version: 1.5.44
 platform: ruby
 authors:
 - Michael