Charles-Edouard
/
Easy_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev/organization/picture-fixture-2' into 'develop' 

Dev/organization/picture fixture 2

See merge request easy-solutions/apps/easyportal!26
This commit is contained in:
Charles-Edouard MARGUERITE 2026-02-02 15:25:59 +00:00
parent 8317617288 2502baf265
commit d5c93fef8c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/controllers/organization_controller.js
View File

@ -73,13 +73,11 @@ export default class extends Controller {
formatterParams: { formatterParams: {
height: "50px", height: "50px",
width: "50px", width: "50px",
urlPrefix: "/", urlPrefix: "",
urlSuffix: "", urlSuffix: "",
}, },
width: 100, 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: "Nom", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle", headerHozAlign: "left"},
{title: "Email", field: "email", headerFilter: "input", widthGrow: 2, vertAlign: "middle", hozAlign: "center"}, {title: "Email", field: "email", headerFilter: "input", widthGrow: 2, vertAlign: "middle", hozAlign: "center"},
{ {

2
src/Controller/ActionController.php
View File

@ -25,7 +25,7 @@ class ActionController extends AbstractController
$actions = $this->entityManager->getRepository(Actions::class)->findBy( $actions = $this->entityManager->getRepository(Actions::class)->findBy(
['Organization' => $organization], ['Organization' => $organization],
['date' => 'DESC'], ['date' => 'DESC'],
15 10
); );
$formattedActivities = $this->actionService->formatActivities($actions); $formattedActivities = $this->actionService->formatActivities($actions);

5
src/Controller/UserController.php
View File

@ -168,7 +168,12 @@ class UserController extends AbstractController
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Calcul du flag de modification : utilisateur admin ET exactement 1 UO // Calcul du flag de modification : utilisateur admin ET exactement 1 UO
if (empty($uoa)){
$canEdit = false;
}else{
$canEdit = $this->userService->canEditRolesCheck($actingUser, $user, $this->isGranted('ROLE_ADMIN'), $singleUo, $organization); $canEdit = $this->userService->canEditRolesCheck($actingUser, $user, $this->isGranted('ROLE_ADMIN'), $singleUo, $organization);
}
} catch (\Exception $e) { } catch (\Exception $e) {
$this->loggerService->logError('error while loading user information', [ $this->loggerService->logError('error while loading user information', [