Commit 66eae3fa authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Accès aux options de configuration possible pour des comptes...

Fix : Accès aux options de configuration possible pour des comptes administrateur complémentaire (la configuration n'est plus basé sur le rôle 'Administrateur' mais sur les privilèges)
parent 5fc53a1f
Loading
Loading
Loading
Loading
+26 −22
Original line number Diff line number Diff line
@@ -43,29 +43,33 @@ return array(
                ],

                [ 'controller' =>  'Administration',
                    'action' => ['users', 'roles', 'rolesEdit',
                        "index", "accessAPI", "roleAPI",
                        "userLogs", 'userRoles', 'organizationRole',
                        'organizationRoleApi', 'activityIndexBuild', 'organizationType',
                        'discipline', 'tva'],
                    'roles' => ['user']
                ],

                [ 'controller' =>  'Administration',
                    'action' => ['parameters'],
                    'roles' => ['Administrateur']
                ],

                [ 'controller' =>  'Administration',
                    'action' => ['numerotation'],
                    'roles' => ['Administrateur']
                    'action' => [
                        "accessAPI",
                        'accueil', // OK
                        'activityIndexBuild', // OK
                        'discipline', // OK
                        'users',
                        'roles',
                        'rolesEdit',
                        "index",
                        "roleAPI",
                        "userLogs",
                        'userRoles',
                        'organizationRole',
                        'organizationRoleApi',
                        'organizationType',
                        'tva',
                        'connectorsConfig',
                        'connectorTest',
                        'connectorExecute',
                        'connectorsHome',
                        'connectorConfigure',
                        'typeDocument',
                        'typeDocumentApi',
                        'numerotation',
                        'parameters'
                    ],



                [ 'controller' =>  'Administration',
                    'action' => ['accueil', 'connectorsConfig', 'connectorTest', 'connectorExecute', 'connectorsHome', 'connectorConfigure','typeDocument', 'typeDocumentApi'],
                    'roles' => ['Administrateur']
                    'roles' => ['user']
                ],

                [ 'controller' =>  'Connector',
+10 −1
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ class AdministrationController extends AbstractOscarController
    }

    public function accueilAction(){
        $this->getOscarUserContext()->check(Privileges::MAINTENANCE_MENU_ADMIN);
        return [];
    }

@@ -387,6 +388,9 @@ class AdministrationController extends AbstractOscarController
    }

    public function connectorsHomeAction(){

        $this->getOscarUserContext()->check(Privileges::MAINTENANCE_CONNECTOR_ACCESS);

        $configOscar = $this->getServiceLocator()->get('OscarConfig');
        $configConnectors = $configOscar->getConfiguration('connectors');

@@ -454,6 +458,8 @@ class AdministrationController extends AbstractOscarController
     */
    public function connectorConfigureAction()
    {
        $this->getOscarUserContext()->check(Privileges::MAINTENANCE_CONNECTOR_ACCESS);

        $connectorType = $this->params()->fromRoute('connectortype');
        $connectorName = $this->params()->fromRoute('connectorname');

@@ -479,6 +485,8 @@ class AdministrationController extends AbstractOscarController
     */
    public function connectorExecuteAction()
    {
        $this->getOscarUserContext()->check(Privileges::MAINTENANCE_CONNECTOR_ACCESS);

        $connectorType = $this->params()->fromRoute('connectortype');
        $connectorName = $this->params()->fromRoute('connectorname');
        $force = $this->params()->fromQuery('force', false);
@@ -520,6 +528,7 @@ class AdministrationController extends AbstractOscarController
     */
    public function connectorsConfigAction()
    {
        $this->getOscarUserContext()->check(Privileges::MAINTENANCE_CONNECTOR_ACCESS);

        ///////////////////////////////////// Connecteurs PERSON <> ORGANIZATION
        $personOrganizationConnectors = $this->getServiceLocator()
@@ -848,7 +857,7 @@ class AdministrationController extends AbstractOscarController

    public function rolesAction()
    {
        $authenticated = $this->getEntityManager()->getRepository(Role::class)->findAll();
        $this->getOscarUserContext()->check(Privileges::DROIT_ROLE_VISUALISATION);
        $out = [];
        return ["roles" => json_encode($out)];
    }