From bbfa9ec1bdab3b5d9571620141c704bfba54dbf4 Mon Sep 17 00:00:00 2001 From: Julius Date: Mon, 27 May 2019 18:54:43 +0200 Subject: [PATCH] Swap recording of leaving and entering impersonate actions --- src/Http/Controllers/ImpersonateController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Http/Controllers/ImpersonateController.php b/src/Http/Controllers/ImpersonateController.php index bfd6107..06d01ff 100644 --- a/src/Http/Controllers/ImpersonateController.php +++ b/src/Http/Controllers/ImpersonateController.php @@ -33,10 +33,6 @@ public function take(Request $request, $id) abort(403); } - if (config('nova-impersonate.actionable')) { - $this->recordAction($request->user()->getKey(), $user_to_impersonate, 'Impersonate'); - } - if (config('nova-impersonate.leave_before_impersonate') && $this->manager->isImpersonating()) { if (config('nova-impersonate.actionable')) { $this->recordAction($this->manager->getImpersonatorId(), auth()->user(), 'Leave Impersonation'); @@ -45,6 +41,10 @@ public function take(Request $request, $id) $this->manager->leave(); } + if (config('nova-impersonate.actionable')) { + $this->recordAction($request->user()->getKey(), $user_to_impersonate, 'Impersonate'); + } + $this->manager->take($request->user(), $user_to_impersonate); $redirectBack = config('nova-impersonate.redirect_back');