cm-admin 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00cd64c6ef60a6e6a8764533d677a742765dc47b30db30fb64e302d350faaaac
-  data.tar.gz: 6a9ab9b8dd72eedf62c31892753103f1c73570ff3a17c6cea60edddfaa52f9b1
+  metadata.gz: 15cf5f7ed76c8f535bbdea485c0c67075d5bd8c98c4b92346d99212b6ff45d8d
+  data.tar.gz: fffe55bb0ceabb342a712073c7003f329871e24362f6b22cd4165c7fc7d0455b
 SHA512:
-  metadata.gz: 02c38abf40ff1651525e1b103bafaf920e18a320abd5fc631779fa6b5d99944bc9546c1145ddfa2a0cd2ef5b78b94eab45fb06b012d66fc74e64e3550d24b8ad
-  data.tar.gz: 63051f6070b8ab489b3d6e55b397cdb7e7e8402284d3436c80cb46d821613a62303544acee2fd0c9bc876bd3631062f9191d3d11334cd50d2b0b461aabe9dc8f
+  metadata.gz: fbc644ba1802f3e1120ce6f461718a08230f9777b2abd3d442a008510c18156710b8374106f300a6fe70707f63d9a4f69d2eb4ba0adde35daf8696a53b3b7346
+  data.tar.gz: '06967882302a44acd967fee3812538635609f1358e0b5a6dade1b1e32228f6e30fe941d6831e407a6cddfba98e7fc56e2c5a8d1006123e56885423a57d262f5a'

data/Gemfile.lock

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

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

@@ -18,7 +18,6 @@ import 'flatpickr'
 import 'jgrowl'
 import Select2 from "select2"
 Select2()
-jqueryJgrowl()
 
 // import '@nathanvda/cocoon'
 import 'daterangepicker'
@@ -39,7 +38,7 @@ document.addEventListener("turbo:load", function () {
   $('.select-2').select2({
     theme: "bootstrap-5",
   });
-  
+  jqueryJgrowl()
 });
 
 $(document).on('click', '.menu-item', function(e) {

data/app/controllers/cm_admin/resource_controller.rb

@@ -31,7 +31,7 @@ module CmAdmin
     def cm_show(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'show')
       scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
-      @ar_object = scoped_model.find(params[:id])
+      @ar_object = fetch_ar_object(scoped_model, params[:id])
       resource_identifier
       respond_to do |format|
         if request.xhr?
@@ -53,7 +53,7 @@ module CmAdmin
 
     def cm_edit(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'edit')
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       resource_identifier
       respond_to do |format|
         format.html { render '/cm_admin/main/' + action_name }
@@ -61,7 +61,7 @@ module CmAdmin
     end
 
     def cm_update(params)
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       @ar_object.assign_attributes(resource_params(params))
       resource_identifier
       resource_responder
@@ -74,7 +74,7 @@ module CmAdmin
     end
 
     def cm_destroy(params)
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       redirect_url = request.referrer || cm_admin.send("#{@model.name.underscore}_index_path")
       respond_to do |format|
         if @ar_object.destroy
@@ -185,7 +185,7 @@ module CmAdmin
       @ar_object, @associated_model, @associated_ar_object = custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
       authorize @ar_object, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
       aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
-      @associated_ar_object = aar_model.find(params[:aar_id]) if params[:aar_id]
+      @associated_ar_object = fetch_ar_object(aar_model, params[:aar_id]) if params[:aar_id]
       nested_fields = get_nested_table_fields(@model.available_fields[:new])
       nested_fields += get_nested_table_fields(@model.available_fields[:edit])
       @reflections = @model.ar_model.reflect_on_all_associations
@@ -202,12 +202,12 @@ module CmAdmin
 
     def resource_responder
       respond_to do |format|
-        if params["referrer"]
-          redirect_url = params["referrer"]
-        else
-          redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}/#{@ar_object.id}"
-        end
         if @ar_object.save
+          redirect_url = if params['referrer']
+                           params['referrer']
+                         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
@@ -222,7 +222,7 @@ module CmAdmin
       @current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
       return unless @current_action
 
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       return @ar_object unless @current_action.child_records
 
       child_records = @ar_object.send(@current_action.child_records)
@@ -353,7 +353,10 @@ module CmAdmin
       params.require(@model.name.underscore.to_sym).permit(*permittable_fields)
     end
 
-    
+    def fetch_ar_object(model_object, id)
+      return model_object.friendly.find(id) if model_object.respond_to?(:friendly)
 
+      model_object.find(id)
+    end
   end
 end

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

@@ -11,9 +11,9 @@
       .popup-card.table-export-popup.hidden
         - if edit_action.present?
           - if @associated_model
-            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id, referrer: request.path)
+            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object, referrer: request.path)
           - else
-            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id)
+            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object)
           = link_to path do
             .popup-option
               span
@@ -21,13 +21,13 @@
               | Edit
         - if destroy_action.present?
           - if @associated_model
-            = button_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object.id, referrer: request.path), method: :delete, form: { data: { turbo_confirm: 'Are you sure?' } } do
+            = button_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object, referrer: request.path), method: :delete, form: { data: { turbo_confirm: 'Are you sure?' } } do
               .popup-option
                 span
                   i.fa.fa-trash
                 | Destroy
           - else
-            = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{ar_object.id.to_s}" } do  
+            = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{ar_object.id.to_s}" } do
               .popup-option
                 span
                   i.fa.fa-trash

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

@@ -5,7 +5,7 @@
   p.table-top__total-count = "#{humanized_ar_collection_count(@associated_ar_object.pagy.count, @action.child_records.to_s)}"
   .table-top__column-action
     - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_ar_object, 'new')
-      - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first      
+      - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
       - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
       a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
         button.btn-secondary Add

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

@@ -45,7 +45,7 @@
             - if column.display_if.call(Current.user) && column.viewable
               td.text-ellipsis data-field-type="#{column.field_type || 'string'}"
                 - if index == 0 && is_show_action_available(@model, ar_object) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
-                  = link_to ar_object.send(column.field_name), cm_admin.send("#{ar_object.model_name.singular}_show_path", ar_object.id)
+                  = link_to ar_object.send(column.field_name), cm_admin.send("#{ar_object.model_name.singular}_show_path", ar_object)
                 - else
                   = show_field_value(ar_object, column)
                   - if column.field_type == :drawer

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

@@ -5,10 +5,10 @@ ul.tabs
         li.nav-item
           - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
           - if via_xhr
-            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}", target: '_blank'
+            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}", target: '_blank'
           - else
-            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
+            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
   // current_action_name is defined when action trail is added to that model
   - if policy([:cm_admin, @model.name.classify.constantize]).send(:history?)
     li.nav-item
-      = link_to 'History', cm_admin.send("#{@ar_object.model_name.singular}_history_path", @ar_object.id), class: "nav-link #{ action_name == 'history' ? 'active' : ''}"
+      = link_to 'History', cm_admin.send("#{@ar_object.model_name.singular}_history_path", @ar_object), class: "nav-link #{ action_name == 'history' ? 'active' : ''}"

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

@@ -1,16 +1,15 @@
-.modal.fade id="#{@model.name.classify}DestroyModal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{@model.name.classify}DestroyModalLabel" tabindex="1" 
+.modal.fade id="#{@model.name.classify}DestroyModal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{@model.name.classify}DestroyModalLabel" tabindex="1"
   .modal-dialog
     .modal-content
       .modal-header
         h5.modal-title id="#{@model.name.classify}DestroyModalLabel" = "#{@model.name.classify} Destroy"
-        button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
+        button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button"
       .modal-body
         .custom-modal-body
           .modal-info data-section="bulk-action"
             | Are you sure you want to delete this #{@model.name.classify}
           .modal-footer
-            = button_to cm_admin.send("#{@model.name.underscore}_destroy_path", ar_object.id), method: :delete, class: "btn btn-primary" do
+            = button_to cm_admin.send("#{@model.name.underscore}_destroy_path", ar_object), method: :delete, class: "btn btn-primary" do
               span
                 i.fa.fa-trash
-              | Destroy
-              
+              |  Destroy

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.4.5'
+  VERSION = '1.4.6'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -102,9 +102,9 @@ module CmAdmin
           if field.association_type.to_s == 'polymorphic'
             association_name = ar_object.send(field.association_name).class.to_s.underscore
             field_name = find_field_name(field, association_name)
-            link_to ar_object.send(field.association_name).send(field_name), cm_admin.send("#{association_name}_show_path", ar_object.send(field.association_name).id)
+            link_to ar_object.send(field.association_name).send(field_name), cm_admin.send("#{association_name}_show_path", ar_object.send(field.association_name))
           elsif ['belongs_to', 'has_one'].include? field.association_type.to_s
-            link_to ar_object.send(field.association_name).send(field.field_name), cm_admin.send("#{field.association_name}_show_path", ar_object.send(field.association_name).id)
+            link_to ar_object.send(field.association_name).send(field.field_name), cm_admin.send("#{field.association_name}_show_path", ar_object.send(field.association_name))
           end
         end
       end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -142,7 +142,7 @@ 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 defined?(::Paperclip) && attached.instance_of?(::Paperclip::Attachment)
+        return if attached.instance_of?(Paperclip::Attachment)
         
         content_tag(:div) do
           if attached.class == ActiveStorage::Attached::Many

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -498,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails