cm-admin 3.0.11 → 3.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff19f67d38436ec27a855939e767014dd4f5141ab77bab65a008214335bbc173
-  data.tar.gz: '085404b4f42517231f0afdf48ea0616a3333eb4a1492d82234bbdaebeb75c8fa'
+  metadata.gz: b67f05a0ab6f311c51a18ff643b6de46aa3d9cf27582ee0edffc494f67db9d08
+  data.tar.gz: 05f13ddf138f740c0ccf1a822d0c135a25f2c73c281a7e5e62809c9dbc05a84c
 SHA512:
-  metadata.gz: 7a11b38ef299303693933134bea4bdbe55136f49890839e2628ef7fb9c7a4615913b492560a8bb5b2d09642aa914138604ae78349c19cabdf0dcd6cffd08ad25
-  data.tar.gz: 5cd4341e3125c9627bfb0dab6ad8a42acbbaeb91e27324c48bdccca80e0c30039b20178fffb689e549d482c4f5a977a9ccf2a2906c13e0c15f2508ff822758bd
+  metadata.gz: 497a5ddaed220d3c4067dd446f9e4280d8501cad4a3db1ee69eacb55400ececbe4d7487c70a1d98de8878316aa13e54f5fd2b5f69c973cdec15041213e39eaa6
+  data.tar.gz: e3878f99744771632245b8fbbd91b46d08952f6e6887665410011422d9ce0669bb7e50374f1e34e442b5c22e126f7f5871c12cbcb88e07894cccd8c95115acc6

data/Gemfile.lock

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

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

@@ -47,8 +47,9 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
   });
   if (submit.length === 0) {
     $("." + form_class).submit();
+    if ($('.' + form_class).attr('data-is-drawer-form') === "true") return;
     $('[data-behaviour="form_submit_spinner"]').removeClass("visually-hidden");
-    return $('[data-behaviour="form_submit"]').addClass("visually-hidden");
+      return $('[data-behaviour="form_submit"]').addClass("visually-hidden");
   }
 });
 

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

@@ -1,5 +1,5 @@
 // This file is shared between rails 6 and 7 version
-
+import LocalTime from "./local-time";
 $(document).on(
   "keypress keyup blur",
   "[data-behaviour='decimal-only'], [data-behaviour='filter'][data-filter-type='range']",
@@ -245,6 +245,5 @@ export function initializeComponents() {
   var headerElemHeight = $(".page-top-bar").height() + 64;
   var calculatedHeight = "calc(100vh - " + headerElemHeight + "px" + ")";
   $(".table-wrapper").css("maxHeight", calculatedHeight);
-  
-  LocalTime.start()
-}
+  LocalTime.start();
+  }

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

@@ -141,9 +141,12 @@
   margin-left: 16px;
 }
 
+.dropdown-toggle {
+  align-items: center;
+}
+
 // Bulk Actions Dropdown
 .bulk-action-item {
-
   form {
     width: 100%;
   }
@@ -163,7 +166,6 @@
     @extend .d-flex, .align-items-center, .gap-2;
   
     &:hover {
-      color: inherit;
       text-decoration: none;
     }
   }
@@ -171,5 +173,6 @@
   a {
     display: flex;
     gap: 8px;
+    align-items: center;
   }
-}
+}

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '3.0.11'
+  VERSION = '3.0.13'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -188,10 +188,10 @@ module CmAdmin
 
           concat split_form_into_section(resource, form_obj, entities)
           concat(content_tag(:div, class: 'form-submit-button-container') do
-            concat form_obj.submit 'Save', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form", turbo_submits_with: 'Submitting...' }
+            concat form_obj.submit 'Save', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
             concat(button_tag(type: 'button', class: 'btn-loading visually-hidden', data: { behaviour: 'form_submit_spinner' }) do
               concat content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')
-              concat ' Submitting...'
+              concat ' Submitting...' unless @is_drawer_form
             end)
             concat button_tag 'Discard', class: 'btn-secondary discard-form', data: { behaviour: 'discard_form' } unless @is_drawer_form
           end)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.13
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -523,7 +523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails