fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(admin): preserve list return target for back and close actions

Browse Source
This commit is contained in:
Felix Schneider
2026-03-11 23:32:11 +01:00
parent bc9506866f
commit 277168f7e8
24 changed files with 525 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pages/admin/users/create().php
View File

@@ -16,6 +16,9 @@ use MintyPHP\Support\Guard;
$session = app(SessionStoreInterface::class)->all();
Guard::requireLogin();
$request = requestInput();
$returnTarget = requestResolveReturnTarget();
$closeTarget = requestResolveReturnTarget('admin/users');
$createTarget = requestPathWithReturnTarget('admin/users/create', $returnTarget);
$authorizationService = app(\MintyPHP\Service\Access\AuthorizationService::class);
$decision = $authorizationService->authorize(UserAuthorizationPolicy::ABILITY_ADMIN_USERS_CREATE, [
'actor_user_id' => (int) ($session['user']['id'] ?? 0),
@@ -93,8 +96,8 @@ $form = [
];
if ($request->isMethod('POST') && !Session::checkCsrfToken()) {
Flash::error(t('Form expired, please try again'), 'admin/users/create', 'csrf_expired');
Router::redirect('admin/users/create');
Flash::error(t('Form expired, please try again'), $createTarget, 'csrf_expired');
Router::redirect($createTarget);
return;
}
@@ -172,7 +175,7 @@ if ($request->hasBody('email')) {
if ($syncErrors) {
Flash::error(
implode(' | ', $syncErrors),
"admin/users/edit/{$createdUuid}",
requestPathWithReturnTarget("admin/users/edit/{$createdUuid}", $returnTarget),
'user_custom_field_sync_failed'
);
}
@@ -181,17 +184,17 @@ if ($request->hasBody('email')) {
}
$action = (string) ($post['action'] ?? 'create');
if ($action === 'create_close') {
Flash::success('User created', 'admin/users', 'user_created');
Router::redirect('admin/users');
Flash::success('User created', $closeTarget, 'user_created');
Router::redirect($closeTarget);
} else {
$uuid = $createdUuid;
if ($uuid !== '') {
$target = "admin/users/edit/{$uuid}";
$target = requestPathWithReturnTarget("admin/users/edit/{$uuid}", $returnTarget);
Flash::success('User created', $target, 'user_created');
Router::redirect($target);
} else {
Flash::success('User created', 'admin/users', 'user_created');
Router::redirect('admin/users');
Flash::success('User created', $closeTarget, 'user_created');
Router::redirect($closeTarget);
}
}
}