cm-admin 1.2.4 → 1.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/app/views/layouts/_custom_action_modal.html.slim +1 -1
- data/app/views/layouts/_custom_action_modals.html.slim +4 -2
- data/lib/cm_admin/models/bulk_action.rb +1 -0
- data/lib/cm_admin/models/dsl_method.rb +2 -2
- data/lib/cm_admin/version.rb +1 -1
- data/lib/cm_admin/view_helpers/form_field_helper.rb +3 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3fe51e58bb1ed8522c203af90ff0d19cd547066283c748fe85abcb23c8d4daaa
|
|
4
|
+
data.tar.gz: 982a1b6707bbf563d7780eef2534295ea414970e76545f45df7d2878d0ed35f4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 20bb85359b28a5457341007bd0e900bded0108375eaf43608a6f583e03651454f2f4aa163ef9ec1a8718ac73ae5b0cc500345112e53529b7e711cc9e8af1a723
|
|
7
|
+
data.tar.gz: 39f51179a605e5d409bdc0418eb78a0f7370f439a7bd07f34acd2f5590e5e384316e38534db728ee21a4e099985408bcdf2a4b16ed27cad973dcd0b2e9b6ae71
|
data/Gemfile.lock
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
.modal.fade id="#{custom_action.name.classify}Modal-#{ar_object
|
|
1
|
+
.modal.fade id="#{custom_action.name.classify}Modal-#{ar_object&.id}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1"
|
|
2
2
|
.modal-dialog
|
|
3
3
|
.modal-content
|
|
4
4
|
.modal-header
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
- custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal }
|
|
1
|
+
- custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :custom }
|
|
2
|
+
- bulk_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :bulk_action }
|
|
2
3
|
- destroy_action = available_actions(@model, 'destroy')
|
|
3
4
|
- if @associated_model
|
|
4
5
|
- custom_action_with_modals += @associated_model.available_actions.select{ |act| act if act.display_type == :modal }
|
|
5
|
-
|
|
6
6
|
- if @current_action&.name == 'index'
|
|
7
|
+
- bulk_action_with_modals.each do |bulk_action|
|
|
8
|
+
= render partial: '/layouts/custom_action_modal', locals: { custom_action: bulk_action, ar_object: nil }
|
|
7
9
|
- @ar_object.data.each do |ar_object|
|
|
8
10
|
- custom_action_with_modals.each do |custom_action|
|
|
9
11
|
= render partial: '/layouts/custom_action_modal', locals: { custom_action: custom_action, ar_object: ar_object }
|
|
@@ -132,9 +132,9 @@ module CmAdmin
|
|
|
132
132
|
# self.class.class_eval(&block)
|
|
133
133
|
end
|
|
134
134
|
|
|
135
|
-
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)
|
|
135
|
+
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)
|
|
136
136
|
bulk_action = CmAdmin::Models::BulkAction.new(
|
|
137
|
-
name: name, display_name: display_name, display_if: display_if,
|
|
137
|
+
name: name, display_name: display_name, display_if: display_if, modal_configuration: modal_configuration,
|
|
138
138
|
redirection_url: redirection_url, icon_name: icon_name, action_type: :bulk_action,
|
|
139
139
|
verb: verb, display_type: display_type, route_type: route_type, partial: partial, &block
|
|
140
140
|
)
|
data/lib/cm_admin/version.rb
CHANGED
|
@@ -104,13 +104,15 @@ module CmAdmin
|
|
|
104
104
|
|
|
105
105
|
def attachment_list(form_obj, cm_field, _value, required_class, _target_action)
|
|
106
106
|
attached = form_obj.object.send(cm_field.field_name)
|
|
107
|
+
return if attached.instance_of?(Paperclip::Attachment)
|
|
108
|
+
|
|
107
109
|
content_tag(:div) do
|
|
108
110
|
if attached.class == ActiveStorage::Attached::Many
|
|
109
111
|
attached.each do |attachment|
|
|
110
112
|
concat attachment_with_icon(attachment)
|
|
111
113
|
end
|
|
112
114
|
else
|
|
113
|
-
concat attachment_with_icon(attached)
|
|
115
|
+
concat attachment_with_icon(attached) if attached
|
|
114
116
|
end
|
|
115
117
|
end
|
|
116
118
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cm-admin
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- sajinmp
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: exe
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2023-10-
|
|
13
|
+
date: 2023-10-12 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|