Merge branch 'develop' into bulk-print-users

2024-09-23 10:26:20 -07:00
parent 5128fd49e6 ab0c009c0d
commit 29af210f4f
161 changed files with 1261 additions and 428 deletions
@@ -372,7 +372,7 @@ class UsersController extends Controller
                $logaction->item_type = User::class;
                $logaction->item_id = $user->id;
                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
+                $logaction->created_by = auth()->id();
                $logaction->logaction('restore');

                // Redirect them to the deleted page if there are more, otherwise the section index