Merge master (c4f38a9c) · Commits · open-source / oscar

module/Oscar/config/module.config.php

+26 −63

Changes for module/Oscar/config/module.config.php: 26 added lines, 63 removed lines.
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', 'documentSections'],
		'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',
		@@ -689,47 +693,6 @@ return array(
		),
		),
		),

		'oscar_searchperson_rebuild' => array(
		'options' => array(
		'route' => 'oscar persons:search:build',
		'defaults' => array(
		'controller' => 'Console',
		'action' => 'buildSearchPerson',
		),
		),
		),

		'oscar_searchporganization_rebuild' => array(
		'options' => array(
		'route' => 'oscar organizations:search:build',
		'defaults' => array(
		'controller' => 'Console',
		'action' => 'buildSearchOrganization',
		),
		),
		),

		'oscar_searchperson_search' => array(
		'options' => array(
		'route' => 'oscar person:search <exp>',
		'defaults' => array(
		'controller' => 'Console',
		'action' => 'searchPerson',
		),
		),
		),

		'oscar_organization_search' => array(
		'options' => array(
		'route' => 'oscar organizations:search <exp>',
		'defaults' => array(
		'controller' => 'Console',
		'action' => 'searchOrganization',
		),
		),
		),

		//////////////////////////////////////////////////////// HARPÉGE
		'console_check_persons' => [
		'options' => array(

module/Oscar/src/Oscar/Controller/AdministrationController.php

+10 −1

Changes for module/Oscar/src/Oscar/Controller/AdministrationController.php: 10 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -285,6 +285,7 @@ class AdministrationController extends AbstractOscarController
		}

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

		@@ -441,6 +442,9 @@ class AdministrationController extends AbstractOscarController
		}

		public function connectorsHomeAction(){

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

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

		@@ -508,6 +512,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');

		@@ -533,6 +539,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);
		@@ -574,6 +582,7 @@ class AdministrationController extends AbstractOscarController
		*/
		public function connectorsConfigAction()
		{
		$this->getOscarUserContext()->check(Privileges::MAINTENANCE_CONNECTOR_ACCESS);

		///////////////////////////////////// Connecteurs PERSON <> ORGANIZATION
		$personOrganizationConnectors = $this->getServiceLocator()
		@@ -902,7 +911,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)];
		}