diff --git a/assets/controllers/organization_controller.js b/assets/controllers/organization_controller.js index 7875ec5..225c662 100644 --- a/assets/controllers/organization_controller.js +++ b/assets/controllers/organization_controller.js @@ -73,13 +73,11 @@ export default class extends Controller { formatterParams: { height: "50px", width: "50px", - urlPrefix: "/", + urlPrefix: "", urlSuffix: "", }, width: 100, }, - // TODO: regarder quel style est mieux entre les "hozAlign" - // TODO: regarder quel style est mieux avec/sans headerFilter {title: "Nom", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle", headerHozAlign: "left"}, {title: "Email", field: "email", headerFilter: "input", widthGrow: 2, vertAlign: "middle", hozAlign: "center"}, { diff --git a/src/Controller/ActionController.php b/src/Controller/ActionController.php index b01b613..cb5e4ab 100644 --- a/src/Controller/ActionController.php +++ b/src/Controller/ActionController.php @@ -25,7 +25,7 @@ class ActionController extends AbstractController $actions = $this->entityManager->getRepository(Actions::class)->findBy( ['Organization' => $organization], ['date' => 'DESC'], - 15 + 10 ); $formattedActivities = $this->actionService->formatActivities($actions); diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index b651714..4602aca 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -168,7 +168,12 @@ class UserController extends AbstractController // ------------------------------------------------------------------- // Calcul du flag de modification : utilisateur admin ET exactement 1 UO - $canEdit = $this->userService->canEditRolesCheck($actingUser, $user, $this->isGranted('ROLE_ADMIN'), $singleUo, $organization); + if (empty($uoa)){ + $canEdit = false; + }else{ + $canEdit = $this->userService->canEditRolesCheck($actingUser, $user, $this->isGranted('ROLE_ADMIN'), $singleUo, $organization); + } + } catch (\Exception $e) { $this->loggerService->logError('error while loading user information', [