cm-admin 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae65becafa199e298f7a291d69efcfb82bfd21ea14727d091bf0a6ec5040d642
-  data.tar.gz: 3b91abd5664970b2fcb6a4bcec060cd97d0461f62718a502fe0e78a5fe80762b
+  metadata.gz: f7e6efbcc18df89a3b37963b143cb81564c1ba2aa07df3972d452f7d79a5615e
+  data.tar.gz: d779de03dae22b2c81c568205a29e3a785c62e4d14bb4a2633c7ee4e9a3c4944
 SHA512:
-  metadata.gz: 60dbdf4ad38f21fc435d3eda1bf0dbff8498fee67fd43622f8853a29954cb6b31de0dcf4f58057fa02e9a7e87eb83f360617940d303fb23d7ca5e9e930891595
-  data.tar.gz: d251828725a456d7acc754a7006ab5c995f2bf8188b8f88e8559e9cd0620c603df64f74fa47b6435d2b717a67ba832c26e06a0354e54af0d3460b182568fd994
+  metadata.gz: b878ed9eb649bb0838b2901d89f1dee2eab61c03bda22a05dd07d27929e0bfbf0c08aad3c0d6c02ebb652ce989330177d168bf4200707a65983ac1de9724a141
+  data.tar.gz: 406bf4e9fe8311d52af3e0f733faf8136c19ef3e3f3bc0547e399afaf13d4cf591d555d031120c3fab1f6f0b7e93c7e6aac1e955eab6d22182c0b49356964874

data/Gemfile.lock

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

data/app/controllers/cm_admin/resource_controller.rb

@@ -135,7 +135,9 @@ module CmAdmin
             end
           elsif @action.display_type == :page
             data = @action.parent == "index" ? @ar_object.data : @ar_object
-            format.html { render @action.partial }
+            # TODO: To set a default value for @action.layout, Since it is used in render above,
+            # Need to check and fix it.
+            format.html { render @action.partial, layout: @action.layout || 'cm_admin' }
           else
             begin
               response_object = @action.code_block.call(@response_object)

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

@@ -19,7 +19,7 @@
               = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
     - if f.object._reflections[assoc_name.to_s]&.macro == :has_many
       .nested-table-footer
-        = link_to_add_association "+ Add #{assoc_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, data: { association_insertion_node: ".insert-cocoon-position-#{uniq_no}", association_insertion_method: 'append' }, class: 'btn-primary'
+        = link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, data: { association_insertion_node: ".insert-cocoon-position-#{uniq_no}", association_insertion_method: 'append' }, class: 'btn-primary'
 - else
   .nested-field-wrapper data-table-name=assoc_name data-model-name=assoc_name.to_s.classify
     / label.nested-field-label = assoc_name.to_s.titleize
@@ -29,4 +29,4 @@
           = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
       - if f.object._reflections[assoc_name.to_s]&.macro == :has_many
         .links.mt-3
-          = link_to_add_association "+ Add #{assoc_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, class: 'd-inline-block btn-primary mt-2'
+          = link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, class: 'd-inline-block btn-primary mt-2'

data/lib/cm_admin/models/custom_action.rb

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

data/lib/cm_admin/models/dsl_method.rb

@@ -121,13 +121,14 @@ module CmAdmin
       #     end
       #   end
       # end
-      def custom_action(name: nil, page_title: nil, page_description: nil, display_name: nil, verb: nil, layout: nil, layout_type: nil, partial: nil, path: nil, display_type: nil, modal_configuration: {}, display_if: lambda { |arg| return true }, route_type: nil, icon_name: 'fa fa-th-large', &block)
+      def custom_action(name: nil, page_title: nil, page_description: nil, display_name: nil, verb: nil, layout: nil, layout_type: nil, partial: nil, path: nil, display_type: nil, modal_configuration: {}, url_params: {}, display_if: lambda { |arg| return true }, route_type: nil, icon_name: 'fa fa-th-large', &block)
         action = CmAdmin::Models::CustomAction.new(
           page_title: page_title, page_description: page_description,
           name: name, display_name: display_name, verb: verb, layout: layout,
           layout_type: layout_type, partial: partial, path: path,
           parent: self.current_action.name, display_type: display_type, display_if: display_if,
-          action_type: :custom, route_type: route_type, icon_name: icon_name, modal_configuration: modal_configuration, &block)
+          action_type: :custom, route_type: route_type, icon_name: icon_name, modal_configuration: modal_configuration,
+          url_params: url_params, &block)
         @available_actions << action
         # self.class.class_eval(&block)
       end

data/lib/cm_admin/models/nested_field.rb

@@ -4,7 +4,7 @@ module CmAdmin
 
       # NestedField is like a container to hold Field and FormField object
 
-      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label
+      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label, :submit_text
 
       def initialize(field_name, attributes={})
         @field_name = field_name
@@ -18,6 +18,7 @@ module CmAdmin
         self.display_type = :table
         self.fields = []
         self.associated_fields = []
+        self.submit_text = "+ Add #{@field_name.to_s.titleize}"
       end
 
     end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.2.8'
+  VERSION = '1.3.0'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -49,6 +49,10 @@ module CmAdmin
           local_date(ar_object.send(field.field_name), (field.format || '%B %e, %Y'))
         when :text
           ar_object.send(field.field_name)
+        when :money
+          humanized_money(ar_object.send(field.field_name))
+        when :money_with_symbol
+          humanized_money_with_symbol(ar_object.send(field.field_name))
         when :custom
           send(field.helper_method, ar_object, field.field_name)
         when :link

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -48,7 +48,7 @@ module CmAdmin
             when :modal
               custom_modal_button(custom_action)
             when :page
-              path = cm_admin.send("#{@model.name.underscore}_#{custom_action.name}_path", @ar_object.id)
+              path = cm_admin.send("#{@model.name.underscore}_#{custom_action.name}_path", @ar_object.id, custom_action.url_params)
               link_to custom_action_title(custom_action), path, class: 'btn-secondary ms-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.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails