effective_resources 2.27.13 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7931f75996f9af33249386222e89073d1ce23ba56730386da85e53b54aad28
-  data.tar.gz: 2172b9d9d4665e14e0e045251515efdb9a6377aa377b0ac2bb241c6b5a608a22
+  metadata.gz: cf2ef756b2bbdecbc58084d754dc2174bbd3c6ac3bf3109bfeaac0b5eb90405d
+  data.tar.gz: ac73d16805a6a7b2a693d73cc22a0c5d06ea955079478f2beff574a07c8d7708
 SHA512:
-  metadata.gz: fcf8db9aa7051cb0ed428d19365a9d2c523f705f0e754a7708061df841cb8a4285aded7a90b116367d8f6a83d223425785fe924f2bef1acd71450edb1acadb37
-  data.tar.gz: 8ea3b73ba641c57fb8d091965fa11d1c5b9aacc1ceecfe0c1f4329bd9bddeb98162bf37c73bb6354130223e3b0198378ac2f73e57a21045c6be8fbf6995f5eb0
+  metadata.gz: dde2d18c768d7940950d5aa0aaa78b41090d96a14067bb9f913027da55ba04a6b6d396fa8bacdcbc9bcddd1c64a203427c9096bd142da9ccbfe8c7ec321339d5
+  data.tar.gz: d834d2b0f76383055355aeb261d7871bfcefb983661e1c228fbcca8c5148730f0cf50dfdc859237f8091a63d197c995d7588638b059467ad4997d2ee85158487

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -81,7 +81,7 @@ module Effective
         end
 
         if respond_to?(:current_user) && resource.respond_to?(:created_by=)
-          resource.created_by ||= current_user
+          resource.created_by ||= (impersonation_user || current_user)
         end
 
         resource.assign_attributes(send(resource_params_method_name))
@@ -142,7 +142,7 @@ module Effective
         end
 
         if respond_to?(:current_user) && resource.respond_to?(:updated_by=)
-          resource.updated_by ||= current_user
+          resource.updated_by ||= (impersonation_user || current_user)
         end
 
         resource.assign_attributes(send(resource_params_method_name))
@@ -255,5 +255,30 @@ module Effective
       end
     end
 
+    def nested_datatable_action(action = nil)
+      Rails.logger.info "Processed by Effective::CrudController#nested_datatable_action"
+
+      raise('expected a GET request') unless request.get?
+      raise('expected @datatable to be present') if @datatable.nil?
+
+      action ||= action_name
+
+      EffectiveResources.authorize!(self, :index, @datatable)
+      @page_title ||= @datatable.datatable_name
+
+      respond_to do |format|
+        format.html do
+          html_template = action if template_present?(action, format: :html)
+          render(html_template || 'index')
+        end
+
+        format.js do
+          html_template = [controller_path, action].join('/') if template_present?(action, format: :html)
+          template = template_present?(action) ? action : 'nested_datatable_action'
+
+          render(template, formats: :js, locals: { action: action, html_template: html_template })
+        end
+      end
+    end
   end
 end

data/app/controllers/concerns/effective/crud_controller/users.rb

@@ -0,0 +1,15 @@
+module Effective
+  module CrudController
+    module Users
+
+      # If we're impersonating, this is the original user
+      def impersonation_user
+        return unless current_user.present?
+        return unless session[:impersonation_user_id].present?
+
+        @impersonation_user ||= current_user.class.find(session[:impersonation_user_id])
+      end
+
+    end
+  end
+end

data/app/controllers/concerns/effective/crud_controller.rb

@@ -10,6 +10,7 @@ module Effective
     include Effective::CrudController::Respond
     include Effective::CrudController::Save
     include Effective::CrudController::Submits
+    include Effective::CrudController::Users
 
     included do
       define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_after_commit, :resource_error

data/app/views/application/nested_datatable_action.js.erb

@@ -0,0 +1,5 @@
+<% if local_assigns[:html_template].present? %>
+  EffectiveForm.remote_form_payload = "<%= j(render(template: local_assigns[:html_template], formats: :html)) %>";
+<% else %>
+  EffectiveForm.remote_form_payload = "<%= j(render_datatable(@datatable, nested: true)) %>";
+<% end %>

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.27.13'.freeze
+  VERSION = '2.29.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.27.13
+  version: 2.29.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -197,6 +197,7 @@ files:
 - app/controllers/concerns/effective/crud_controller/respond.rb
 - app/controllers/concerns/effective/crud_controller/save.rb
 - app/controllers/concerns/effective/crud_controller/submits.rb
+- app/controllers/concerns/effective/crud_controller/users.rb
 - app/controllers/concerns/effective/flash_messages.rb
 - app/controllers/concerns/effective/impersonation_controller/destroy.rb
 - app/controllers/concerns/effective/impersonation_controller/impersonate.rb
@@ -267,6 +268,7 @@ files:
 - app/views/application/edit.js.erb
 - app/views/application/index.html.haml
 - app/views/application/member_action.js.erb
+- app/views/application/nested_datatable_action.js.erb
 - app/views/application/new.html.haml
 - app/views/application/new.js.erb
 - app/views/application/show.html.haml