effective_resources 2.28.0 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4229845a5685455eaf623f5d8f6516735d3d414c76be408db9e86df50dc1c477
-  data.tar.gz: 5f0171e49a79cd0cdc7b1438f2c91ab6f52d99efa29a818636bf6593610832ed
+  metadata.gz: 90df98c5f5d1a618fc2bc4a0ca4dc4a48a2d2b1464295258d489e77c90a495e8
+  data.tar.gz: 1e68120f9b3eff24664b401b09fafaf0fe799ce8bd5da03f47398958b69e700f
 SHA512:
-  metadata.gz: ee066f39b9632ebb46cf77d47f96334c433360dadd9a60e41faffa30e1cc4dad249e5903faa67c7196cc0c8a8762b54cda94c02e218bda9cad36556015e0cb9e
-  data.tar.gz: 13cf2ff5ccb197c951ffedd77ed1cc3d96872a81327903072fd6a4ef852fed53f51587704d7928350ea8f6d7450301660ce51876172897843ad2d0012808ac56
+  metadata.gz: 8480ea5fc56d57afc54874d53d095a5d2df354e9c75df35ef0774387e41fca1503989f831170fce558a41d23fc4007ac724238c8a4b45f03875524ec2ad6ea49
+  data.tar.gz: '0392e670ebc5e8b46688f1f5c31c0db82bb77f9622bb46b8ac6fee7adb625a2f2a94e4763181f07bb0865f3937a0389442367a2be691c45e2df2976bfa096c45'

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))

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/controllers/concerns/effective/impersonation_controller/impersonate.rb

@@ -1,6 +1,11 @@
 module Effective
   module ImpersonationController
     module Impersonate
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :delete_blank_password_params, only: [:update]
+      end
 
       def impersonate
         @user = current_user.class.find(params[:id])
@@ -24,6 +29,15 @@ module Effective
         try(:dashboard_path) || try(:root_path) || '/'
       end
 
+      private
+
+      def delete_blank_password_params
+        if params[:user] && params[:user][:password].blank?
+          params[:user].delete(:password)
+          params[:user].delete(:password_confirmation)
+        end
+      end
+
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.28.0'.freeze
+  VERSION = '2.30.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.30.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-05-16 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