cm-admin 1.5.28 → 1.5.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7935960984bf5a170dbb16e272ce951ab886ae16fcbb131d25fcbaafc31a8e82
-  data.tar.gz: de1756f433cdb23fccf3daaee59e46b8436ca37cee29b5c34808a19d28211989
+  metadata.gz: 8633d5b2705caba1ed7329b20ac6bfad6e4ef045ded72027768fc615eca2aefe
+  data.tar.gz: 6c825574261c4552a5c94e9c9a3260267717c6521a974202abc832f1b3c893ef
 SHA512:
-  metadata.gz: 315d9e2c449721ac68ae48fe238ad80035208b774c84e31c71f70bf9c4fb3f481ae0ff37d1e9fa76aaa9040106d59a202e7baea257cc2b603ecb7bd4cdc08efc
-  data.tar.gz: 00577270ba1efaee074b670e339e80ee80692414b3ea7ecc2388951443d881bbbc3f5f56866baa4f0b7c907d8a1188f10dd6081fbafce27d268f37bbbb67c276
+  metadata.gz: db5ace7e6cb92376805d4d51cc6ce3cf15228b3756efaa2983e74be73b4d2a8861c30559adb58be2bc0d95c4208d920e4433386b4d604ec7149335f820bd0abd
+  data.tar.gz: 8767d826ba1d1d3b5f9950c5dfcbc4582a7a730b234c04c2aef5f956ca52807c0498373d1ffca23e9afc7a7175cae28249e93946cbc98e7c7772c4aa948fc6c8

data/Gemfile.lock

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

data/app/controllers/cm_admin/resource_controller.rb

@@ -62,6 +62,7 @@ module CmAdmin
     end
 
     def cm_update(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'edit')
       @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       @ar_object.assign_attributes(resource_params(params))
       resource_identifier
@@ -69,6 +70,7 @@ module CmAdmin
     end
 
     def cm_create(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'new')
       @ar_object = @model.ar_model.name.classify.constantize.new(resource_params(params))
       resource_identifier
       resource_responder
@@ -206,13 +208,15 @@ module CmAdmin
         if @ar_object.save
           redirect_url = if params['referrer']
                            params['referrer']
+                         elsif @current_action.redirect_to.present?
+                           @current_action.redirect_to.call(@ar_object)
                          else
                            cm_admin.send("#{@model.name.underscore}_show_path", @ar_object)
                          end
           if params['attachment_destroy_ids'].present?
             ActiveStorage::Attachment.where(id: params['attachment_destroy_ids']).destroy_all
           end
-          format.html { redirect_to  redirect_url, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
+          format.html { redirect_to redirect_url, allow_other_host: true, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
         else
           format.html { render '/cm_admin/main/new', notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
         end

data/lib/cm_admin/model.rb

@@ -26,6 +26,8 @@ module CmAdmin
     include Pagy::Backend
     include Models::Blocks
     include Models::DslMethod
+    include CmAdmin::Engine.routes.url_helpers
+
     attr_accessor :available_actions, :actions_set, :available_fields, :additional_permitted_fields,
       :current_action, :params, :filters, :available_tabs, :icon_name, :bulk_actions
     attr_reader :name, :ar_model, :is_visible_on_sidebar, :importer
@@ -50,7 +52,6 @@ module CmAdmin
     end
 
     class << self
-
       def find_by(search_hash)
         CmAdmin.config.cm_admin_models.find { |x| x.name == search_hash[:name] }
       end

data/lib/cm_admin/models/action.rb

@@ -7,7 +7,7 @@ module CmAdmin
       attr_accessor :name, :display_name, :verb, :layout_type, :layout, :partial, :path, :page_title, :page_description,
         :child_records, :is_nested_field, :nested_table_name, :parent, :display_if, :route_type, :code_block,
         :display_type, :action_type, :redirection_url, :sort_direction, :sort_column, :icon_name, :scopes, :view_type,
-        :kanban_attr, :model_name
+        :kanban_attr, :model_name, :redirect_to
 
       VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
@@ -44,11 +44,12 @@ module CmAdmin
         self.kanban_attr = {}
       end
 
-      def set_values(page_title, page_description, partial, view_type=:table)
+      def set_values(page_title, page_description, partial, redirect_to = nil, view_type=:table)
         self.page_title = page_title
         self.page_description = page_description
         self.partial = partial
         self.view_type = view_type
+        self.redirect_to = redirect_to
       end
 
       def controller_action_name

data/lib/cm_admin/models/dsl_method.rb

@@ -15,15 +15,15 @@ module CmAdmin
         yield
       end
 
-      def cm_edit(page_title: nil,page_description: nil, partial: nil, &block)
+      def cm_edit(page_title: nil, page_description: nil, partial: nil, redirect_to: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
-        @current_action.set_values(page_title, page_description, partial)
+        @current_action.set_values(page_title, page_description, partial, redirect_to)
         yield
       end
 
-      def cm_new(page_title: nil,page_description: nil, partial: nil, &block)
+      def cm_new(page_title: nil, page_description: nil, partial: nil, redirect_to: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'new')
-        @current_action.set_values(page_title, page_description, partial)
+        @current_action.set_values(page_title, page_description, partial, redirect_to)
         yield
       end
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.28'
+  VERSION = '1.5.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.28
+  version: 1.5.29
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails