cm-admin 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faecf51ddd1a7dd895ec281a4beb4b4a88e8efe63918b41cac512f72ec27c460
-  data.tar.gz: d1e94c3ec4bc95e8bc4bc3a42572d62606019dec522cc172135e2201ccd63f63
+  metadata.gz: 86d033fefa5d556af30d7127b65993513423c82a5358774eba875ab17d8946a1
+  data.tar.gz: 466f4769e70f2d6133873d5931cb4d6fbf826629b8ad3b837ff06b5fe36c49ca
 SHA512:
-  metadata.gz: 93f0cc6ef4e82a7aa47c776fcf1bc4ce9eba0f3f728eac78c9ee6f28d6cf887e8189cdb800bf67af8aa85a93ce0ace51d36cc65f243e0e946f59f061cf97656d
-  data.tar.gz: 9472785aa3b6c2648be151f9d188d2084748cd35fbdadab91a9d53045eea06129bb09ec3e28e63ba371829988c0307720821862d467d9d008d1056e6033300af
+  metadata.gz: 5d5f05bc6a9a5e02226c95e8a487210b391272e4d8bf871327fbc013359f9f4e25e50d0bb68b57c08607573e57fb92e142282f0176bb3e7ad5473047904f97c7
+  data.tar.gz: 0b6f062d86781a11903361f97bd2d3de607d500ff675b0ce1acebfbdb0548cd4842033d54066ba058aacd7f57ec6570383570ae5f6a7d1eb8e263884f0e6d535

data/Gemfile.lock

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

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

@@ -1,37 +1,36 @@
-$(document).on('turbolinks:load', function () {
-  $(document).on('click', '.form_submit', function(e) {
-    e.preventDefault();
-    var submit = [];
-    var form_class = $(this).data('form-class');
-    $("." + form_class + " input.required, ." + form_class + " textarea.required").each(function() {
-      $(this).removeClass('error');
-      if ($(this).val().trim().length === 0) {
-        $(this).addClass('error');
-        window.scrollTo(top);
-        submit.push(true);
-      }
-    });
-    $("." + form_class + " select.required").each(function() {
-      $(this).removeClass('error');
-      if ($(this).val().trim().length === 0) {
-        $(this).parent().find('.select2').addClass('error');
-        window.scrollTo(top);
-        submit.push(true);
-      }
-    });
-    $('.nested_input_validation').each(function() {
-      var class_name;
-      class_name = $(this).data('class-name');
-      $(this).parents(':nth(1)').find('.' + class_name).addClass('hidden');
-      if ($(this).val().trim().length === 0) {
-        $(this).parents(':nth(1)').find('.' + class_name).removeClass('hidden');
-        window.scrollTo(top);
-        submit.push(true);
-      }
-    });
-    if (submit.length === 0) {
-      $('.' + form_class).submit();
-      return $('.form_submit').button('loading');
+$(document).on('click', '.form_submit', function(e) {
+  console.log('Came here')
+  e.preventDefault();
+  var submit = [];
+  var form_class = $(this).data('form-class');
+  $("." + form_class + " input.required, ." + form_class + " textarea.required").each(function() {
+    $(this).removeClass('error');
+    if ($(this).val().trim().length === 0) {
+      $(this).addClass('error');
+      $(this)[0].scrollIntoView(true);
+      submit.push(true);
     }
   });
-});
+  $("." + form_class + " select.required").each(function() {
+    $(this).removeClass('error');
+    if ($(this).val().trim().length === 0) {
+      $(this).parent().find('.select2').addClass('error');
+      $(this)[0].scrollIntoView(true);
+      submit.push(true);
+    }
+  });
+  $('.nested_input_validation').each(function() {
+    var class_name;
+    class_name = $(this).data('class-name');
+    $(this).parents(':nth(1)').find('.' + class_name).addClass('hidden');
+    if ($(this).val().trim().length === 0) {
+      $(this).parents(':nth(1)').find('.' + class_name).removeClass('hidden');
+      $(this)[0].scrollIntoView(true);
+      submit.push(true);
+    }
+  });
+  if (submit.length === 0) {
+    $('.' + form_class).submit();
+    return $('.form_submit').button('loading');
+  }
+});

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

@@ -22,7 +22,11 @@ $(document).on('click', '.row-action-cell', function(e) {
     $('.row-action-cell').removeClass('opacity-1')
     $(this).addClass('opacity-1');
   }
-  $(this).find('.table-export-popup').toggle('hidden')
+  if ($(this).find('.table-export-popup').hasClass('hidden')) {
+    return $(this).find('.table-export-popup').removeClass('hidden');
+  } else {
+    return $(this).find('.table-export-popup').addClass('hidden');
+  }
 });
 
 

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

@@ -72,7 +72,7 @@ a {
   position: sticky;
   top: 0;
   background-color: $white;
-  z-index: 4;
+  z-index: 5;
 }
 
 .scrollable {

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

@@ -8,7 +8,7 @@
   height: 100%;
   background-color: #252525;
   // overflow: hidden;
-  z-index: 2;
+  z-index: 3;
 
   &__logo-header {
     display: flex;

data/app/views/cm_admin/main/_actions_dropdown.html.slim

@@ -34,7 +34,7 @@
           - if custom_action.display_if.call(ar_object)
             - case custom_action.display_type
             - when :button
-              = link_to cm_admin.send("#{cm_model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
+              = button_to cm_admin.send("#{cm_model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
                 .popup-option
                   span
                     i class="#{custom_action.icon_name}"

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -73,9 +73,9 @@ module CmAdmin
 
       def custom_action_button(custom_action, current_action_name)
         if current_action_name == "index"
-          link_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
         elsif current_action_name == "show"
-          link_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails