corrected redirection logic
This commit is contained in:
parent
7da97b0d02
commit
70842d6fe9
|
|
@ -159,7 +159,6 @@ class UserController extends AbstractController
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO : MONOLOG
|
|
||||||
#[Route('/edit/{id}', name: 'edit', methods: ['GET', 'POST'])]
|
#[Route('/edit/{id}', name: 'edit', methods: ['GET', 'POST'])]
|
||||||
public function edit(int $id, Request $request): Response
|
public function edit(int $id, Request $request): Response
|
||||||
{
|
{
|
||||||
|
|
@ -183,16 +182,19 @@ class UserController extends AbstractController
|
||||||
$user->setModifiedAt(new \DateTimeImmutable('now'));
|
$user->setModifiedAt(new \DateTimeImmutable('now'));
|
||||||
$this->entityManager->persist($user);
|
$this->entityManager->persist($user);
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
//log and action
|
||||||
|
$this->logger->notice("User information edited for " . $user->getUserIdentifier());
|
||||||
if ($request->get('organizationId')) {
|
if ($request->get('organizationId')) {
|
||||||
$org = $this->organizationRepository->find($request->get('organizationId'));
|
$org = $this->organizationRepository->find($request->get('organizationId'));
|
||||||
if ($org) {
|
if ($org) {
|
||||||
$this->actionService->createAction("Edit user information", $actingUser, $org, $user->getUserIdentifier());
|
$this->actionService->createAction("Edit user information", $actingUser, $org, $user->getUserIdentifier());
|
||||||
|
return $this->redirectToRoute('user_show', ['id' => $user->getId(), 'organizationId' => $request->get('organizationId')]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->actionService->createAction("Edit user information", $actingUser, null, $user->getUserIdentifier());
|
$this->actionService->createAction("Edit user information", $actingUser, null, $user->getUserIdentifier());
|
||||||
|
return $this->redirectToRoute('user_show', ['id' => $user->getId()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->redirectToRoute('user_show', ['id' => $user->getId(), 'organizationId' => $request->get('organizationId')]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->render('user/edit.html.twig', [
|
return $this->render('user/edit.html.twig', [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue