cm-admin 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761f5d07363458ff70baaaf931e973f5b0b6dca0be30786ebb5ade83bb5b6934
-  data.tar.gz: 07b19cdc0bb2d6fa6f8a87199751c0d5be4e3a0bf6da11faf7ee7e8643d5836e
+  metadata.gz: 3fe51e58bb1ed8522c203af90ff0d19cd547066283c748fe85abcb23c8d4daaa
+  data.tar.gz: 982a1b6707bbf563d7780eef2534295ea414970e76545f45df7d2878d0ed35f4
 SHA512:
-  metadata.gz: 741d8416b844f57064606e4d7616805ab7670000dfde9a21d6b21184b55a6cf5538bd85d403e711b65d14c1118c2cf1e68daaff66f261832d57653b16111c7bb
-  data.tar.gz: c48c03392357838aa183e10583ea6f57c7962dea1c5a05e71e66af5da2054cdef9f8fe70d8b3a01c9688a074a76a3c8573e43291d0159d10548905b8513e6fab
+  metadata.gz: 20bb85359b28a5457341007bd0e900bded0108375eaf43608a6f583e03651454f2f4aa163ef9ec1a8718ac73ae5b0cc500345112e53529b7e711cc9e8af1a723
+  data.tar.gz: 39f51179a605e5d409bdc0418eb78a0f7370f439a7bd07f34acd2f5590e5e384316e38534db728ee21a4e099985408bcdf2a4b16ed27cad973dcd0b2e9b6ae71

data/Gemfile.lock

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

data/app/views/layouts/_custom_action_modal.html.slim

@@ -1,4 +1,4 @@
-.modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
+.modal.fade id="#{custom_action.name.classify}Modal-#{ar_object&.id}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
   .modal-dialog
     .modal-content
       .modal-header

data/app/views/layouts/_custom_action_modals.html.slim

@@ -1,9 +1,11 @@
-- custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal }
+- custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :custom }
+- bulk_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :bulk_action }
 - destroy_action = available_actions(@model, 'destroy')
 - if @associated_model
   - custom_action_with_modals += @associated_model.available_actions.select{ |act| act if act.display_type == :modal }
-
 - if @current_action&.name == 'index'
+  - bulk_action_with_modals.each do |bulk_action|
+    = render partial: '/layouts/custom_action_modal', locals: { custom_action: bulk_action, ar_object: nil }
   - @ar_object.data.each do |ar_object|
     - custom_action_with_modals.each do |custom_action|
       = render partial: '/layouts/custom_action_modal', locals: { custom_action: custom_action, ar_object: ar_object }

data/lib/cm_admin/models/bulk_action.rb

@@ -3,6 +3,7 @@ require_relative 'actions/blocks'
 module CmAdmin
   module Models
     class BulkAction < Action
+      attr_accessor :modal_configuration
 
       def initialize(attributes = {}, &block)
         super

data/lib/cm_admin/models/dsl_method.rb

@@ -132,9 +132,9 @@ module CmAdmin
         # self.class.class_eval(&block)
       end
 
-      def bulk_action(name: nil, display_name: nil, display_if: lambda { |arg| return true }, redirection_url: nil, icon_name: nil, verb: nil, display_type: nil, route_type: nil, partial: nil, &block)
+      def bulk_action(name: nil, display_name: nil, display_if: lambda { |arg| return true }, redirection_url: nil, icon_name: nil, verb: nil, display_type: nil, modal_configuration: {}, route_type: nil, partial: nil, &block)
         bulk_action = CmAdmin::Models::BulkAction.new(
-          name: name, display_name: display_name, display_if: display_if,
+          name: name, display_name: display_name, display_if: display_if, modal_configuration: modal_configuration,
           redirection_url: redirection_url, icon_name: icon_name, action_type: :bulk_action,
           verb: verb, display_type: display_type, route_type: route_type, partial: partial, &block
         )

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.2.4'
+  VERSION = '1.2.6'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -104,13 +104,15 @@ module CmAdmin
 
       def attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         attached = form_obj.object.send(cm_field.field_name)
+        return if attached.instance_of?(Paperclip::Attachment)
+        
         content_tag(:div) do
           if attached.class == ActiveStorage::Attached::Many
             attached.each do |attachment|
               concat attachment_with_icon(attachment)
             end
           else
-            concat attachment_with_icon(attached)
+            concat attachment_with_icon(attached) if attached
           end
         end
       end

metadata

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