Loading admin/src/DataGen.php −15 Changes for admin/src/DataGen.php: 0 added lines, 15 removed lines. Original line number Diff line number Diff line Loading @@ -397,21 +397,6 @@ class DataGen } } /* L'administrateur doit avoir tous les droits obligatoirement! */ $this->logMsg('Attribution de tous les droits au rôle Administrateur ...', true); $this->oseAdmin->getBdd()->exec(" INSERT INTO ROLE_PRIVILEGE(PRIVILEGE_ID, ROLE_ID) SELECT P.ID PRIVILEGE_ID, R.ID ROLE_ID FROM PRIVILEGE P JOIN ROLE R ON R.CODE = 'administrateur' LEFT JOIN ROLE_PRIVILEGE RP ON RP.PRIVILEGE_ID = P.ID AND RP.ROLE_ID = R.ID WHERE RP.ROLE_ID IS NULL "); $this->logMsg('Mise à jour du point d\'indice pour les HETD ...', true); $this->oseAdmin->getBdd()->exec('BEGIN OSE_FORMULE.UPDATE_ANNEE_TAUX_HETD; END;'); $this->logEnd(); Loading config/autoload/unicaen-auth.global.php +5 −28 Changes for config/autoload/unicaen-auth.global.php: 5 added lines, 28 removed lines. Original line number Diff line number Diff line Loading @@ -13,8 +13,6 @@ $settings = [ */ 'enable_registration' => false, 'enable_privileges' => true, 'entity_manager_name' => 'doctrine.entitymanager.orm_default', // nom du gestionnaire d'entités à utiliser /** Loading Loading @@ -106,22 +104,11 @@ if (AppConfig::get('cas', 'actif')) { ]; } $localConfig = [ return [ 'unicaen-auth' => $settings, 'bjyauthorize' => [ /* this module uses a meta-role that inherits from any roles that should * be applied to the active user. the identity provider tells us which * roles the "identity role" should inherit from. * * for ZfcUser, this will be your default identity provider */ //'identity_provider' => 'UnicaenAuth\Provider\Identity\Chain', /* role providers simply provide a list of roles that should be inserted * into the Laminas\Acl instance. the module comes with two providers, one * to specify roles in a config file and one to load roles using a * Laminas\Db adapter. */ 'role_providers' => [ /** * Fournit les rôles issus de la base de données éventuelle de l'appli. Loading @@ -136,15 +123,6 @@ $localConfig = [ */ //'UnicaenAuth\Provider\Role\Username' => [], ], ], 'zfcuser' => [ $k = 'enable_registration' => isset($settings[$k]) ? $settings[$k] : false, ], ]; if ($settings['enable_privileges']) { $privileges = [ 'bjyauthorize' => [ 'resource_providers' => [ /** Loading Loading @@ -191,9 +169,8 @@ if ($settings['enable_privileges']) { ], ], ], ]; } else { $privileges = []; } return array_merge_recursive($localConfig, $privileges); No newline at end of file 'zfcuser' => [ $k = 'enable_registration' => isset($settings[$k]) ? $settings[$k] : false, ], ]; No newline at end of file data/ddl/package/OSE_WORKFLOW/body.sql +5 −8 Changes for data/ddl/package/OSE_WORKFLOW/body.sql: 5 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -380,14 +380,11 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS WHEN e.code = ''REFERENTIEL_VALIDATION'' THEN si.referentiel_prevu WHEN e.code = ''CONSEIL_ACADEMIQUE'' OR e.code = ''CONSEIL_RESTREINT'' THEN CASE WHEN EXISTS( SELECT statut_id FROM type_agrement_statut tas JOIN type_agrement ta ON ta.id = tas.type_agrement_id WHERE tas.histo_destruction IS NULL AND ta.code = e.code AND tas.statut_id = si.id ) THEN 1 ELSE 0 END WHEN e.code = ''CONSEIL_ACADEMIQUE'' THEN si.conseil_aca WHEN e.code = ''CONSEIL_RESTREINT'' THEN si.conseil_restreint WHEN e.code = ''CONTRAT'' THEN si.contrat Loading data/privileges.php +12 −12 Changes for data/privileges.php: 12 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -128,9 +128,11 @@ return [ 'enseignement' => [ 'libelle' => 'Enseignement', 'privileges' => [ 'visualisation' => 'Visualisation', 'edition' => 'Édition', 'edition-masse' => 'Édition en masse', 'prevu-visualisation' => 'Visualisation du prévisionnel', 'prevu-edition' => 'Édition du prévisionnel', 'realise-visualisation' => 'Visualisation du réalisé', 'realise-edition' => 'Édition du réalisé', 'exterieur' => 'Saisie de service dans une autre université', 'validation' => 'Validation', 'autovalidation' => 'Validation automatique', Loading @@ -153,8 +155,10 @@ return [ 'referentiel' => [ 'libelle' => 'Référentiel', 'privileges' => [ 'visualisation' => 'Visualisation', 'edition' => 'Édition', 'prevu-visualisation' => 'Visualisation du prévisionnel', 'prevu-edition' => 'Édition du prévisionnel', 'realise-visualisation' => 'Visualisation du réalisé', 'realise-edition' => 'Édition du réalisé', 'validation' => 'Validation', 'autovalidation' => 'Validation automatique', 'admin-edition' => 'Administration - Édition', Loading Loading @@ -246,6 +250,7 @@ return [ 'tables-visualisation' => 'Tables (visualisation)', ], ], 'type-intervention' => [ 'libelle' => 'Type d\'intervention', 'privileges' => [ Loading @@ -253,6 +258,7 @@ return [ 'edition' => 'Édition', ], ], 'type-ressource' => [ 'libelle' => 'Types de ressources', 'privileges' => [ Loading @@ -261,14 +267,6 @@ return [ ], ], 'unicaen-tbl' => [ 'libelle' => 'Tableaux de bord', 'privileges' => [ 'admin' => 'Gestion des tableaux de bord', 'actualisation' => 'Actualisation', ], ], 'modulateur' => [ 'libelle' => 'Modulateurs', 'privileges' => [ Loading Loading @@ -424,6 +422,7 @@ return [ 'tests' => 'Tests', ], ], 'referentiel-commun' => [ 'libelle' => 'Référentiels communs', 'privileges' => [ Loading @@ -433,6 +432,7 @@ return [ 'employeur-edition' => 'Édition employeurs', ], ], 'nomenclature-rh' => [ 'libelle' => 'Nomenclature RH', 'privileges' => [ Loading module/Application/config/intervenant.config.php +8 −4 Changes for module/Application/config/intervenant.config.php: 8 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -479,8 +479,10 @@ return [ 'controller' => 'Application\Controller\Intervenant', 'action' => ['services'], 'privileges' => [ Privileges::ENSEIGNEMENT_VISUALISATION, Privileges::REFERENTIEL_VISUALISATION, Privileges::ENSEIGNEMENT_PREVU_VISUALISATION, Privileges::ENSEIGNEMENT_REALISE_VISUALISATION, Privileges::REFERENTIEL_PREVU_VISUALISATION, Privileges::REFERENTIEL_REALISE_VISUALISATION, ], 'assertion' => Assertion\ServiceAssertion::class, ], Loading Loading @@ -540,8 +542,10 @@ return [ 'controller' => 'Application\Controller\Intervenant', 'action' => ['formule-totaux-hetd'], 'privileges' => [ Privileges::ENSEIGNEMENT_VISUALISATION, Privileges::REFERENTIEL_VISUALISATION, Privileges::ENSEIGNEMENT_PREVU_VISUALISATION, Privileges::ENSEIGNEMENT_REALISE_VISUALISATION, Privileges::REFERENTIEL_PREVU_VISUALISATION, Privileges::REFERENTIEL_REALISE_VISUALISATION, ], ], [ Loading Loading
admin/src/DataGen.php −15 Changes for admin/src/DataGen.php: 0 added lines, 15 removed lines. Original line number Diff line number Diff line Loading @@ -397,21 +397,6 @@ class DataGen } } /* L'administrateur doit avoir tous les droits obligatoirement! */ $this->logMsg('Attribution de tous les droits au rôle Administrateur ...', true); $this->oseAdmin->getBdd()->exec(" INSERT INTO ROLE_PRIVILEGE(PRIVILEGE_ID, ROLE_ID) SELECT P.ID PRIVILEGE_ID, R.ID ROLE_ID FROM PRIVILEGE P JOIN ROLE R ON R.CODE = 'administrateur' LEFT JOIN ROLE_PRIVILEGE RP ON RP.PRIVILEGE_ID = P.ID AND RP.ROLE_ID = R.ID WHERE RP.ROLE_ID IS NULL "); $this->logMsg('Mise à jour du point d\'indice pour les HETD ...', true); $this->oseAdmin->getBdd()->exec('BEGIN OSE_FORMULE.UPDATE_ANNEE_TAUX_HETD; END;'); $this->logEnd(); Loading
config/autoload/unicaen-auth.global.php +5 −28 Changes for config/autoload/unicaen-auth.global.php: 5 added lines, 28 removed lines. Original line number Diff line number Diff line Loading @@ -13,8 +13,6 @@ $settings = [ */ 'enable_registration' => false, 'enable_privileges' => true, 'entity_manager_name' => 'doctrine.entitymanager.orm_default', // nom du gestionnaire d'entités à utiliser /** Loading Loading @@ -106,22 +104,11 @@ if (AppConfig::get('cas', 'actif')) { ]; } $localConfig = [ return [ 'unicaen-auth' => $settings, 'bjyauthorize' => [ /* this module uses a meta-role that inherits from any roles that should * be applied to the active user. the identity provider tells us which * roles the "identity role" should inherit from. * * for ZfcUser, this will be your default identity provider */ //'identity_provider' => 'UnicaenAuth\Provider\Identity\Chain', /* role providers simply provide a list of roles that should be inserted * into the Laminas\Acl instance. the module comes with two providers, one * to specify roles in a config file and one to load roles using a * Laminas\Db adapter. */ 'role_providers' => [ /** * Fournit les rôles issus de la base de données éventuelle de l'appli. Loading @@ -136,15 +123,6 @@ $localConfig = [ */ //'UnicaenAuth\Provider\Role\Username' => [], ], ], 'zfcuser' => [ $k = 'enable_registration' => isset($settings[$k]) ? $settings[$k] : false, ], ]; if ($settings['enable_privileges']) { $privileges = [ 'bjyauthorize' => [ 'resource_providers' => [ /** Loading Loading @@ -191,9 +169,8 @@ if ($settings['enable_privileges']) { ], ], ], ]; } else { $privileges = []; } return array_merge_recursive($localConfig, $privileges); No newline at end of file 'zfcuser' => [ $k = 'enable_registration' => isset($settings[$k]) ? $settings[$k] : false, ], ]; No newline at end of file
data/ddl/package/OSE_WORKFLOW/body.sql +5 −8 Changes for data/ddl/package/OSE_WORKFLOW/body.sql: 5 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -380,14 +380,11 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS WHEN e.code = ''REFERENTIEL_VALIDATION'' THEN si.referentiel_prevu WHEN e.code = ''CONSEIL_ACADEMIQUE'' OR e.code = ''CONSEIL_RESTREINT'' THEN CASE WHEN EXISTS( SELECT statut_id FROM type_agrement_statut tas JOIN type_agrement ta ON ta.id = tas.type_agrement_id WHERE tas.histo_destruction IS NULL AND ta.code = e.code AND tas.statut_id = si.id ) THEN 1 ELSE 0 END WHEN e.code = ''CONSEIL_ACADEMIQUE'' THEN si.conseil_aca WHEN e.code = ''CONSEIL_RESTREINT'' THEN si.conseil_restreint WHEN e.code = ''CONTRAT'' THEN si.contrat Loading
data/privileges.php +12 −12 Changes for data/privileges.php: 12 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -128,9 +128,11 @@ return [ 'enseignement' => [ 'libelle' => 'Enseignement', 'privileges' => [ 'visualisation' => 'Visualisation', 'edition' => 'Édition', 'edition-masse' => 'Édition en masse', 'prevu-visualisation' => 'Visualisation du prévisionnel', 'prevu-edition' => 'Édition du prévisionnel', 'realise-visualisation' => 'Visualisation du réalisé', 'realise-edition' => 'Édition du réalisé', 'exterieur' => 'Saisie de service dans une autre université', 'validation' => 'Validation', 'autovalidation' => 'Validation automatique', Loading @@ -153,8 +155,10 @@ return [ 'referentiel' => [ 'libelle' => 'Référentiel', 'privileges' => [ 'visualisation' => 'Visualisation', 'edition' => 'Édition', 'prevu-visualisation' => 'Visualisation du prévisionnel', 'prevu-edition' => 'Édition du prévisionnel', 'realise-visualisation' => 'Visualisation du réalisé', 'realise-edition' => 'Édition du réalisé', 'validation' => 'Validation', 'autovalidation' => 'Validation automatique', 'admin-edition' => 'Administration - Édition', Loading Loading @@ -246,6 +250,7 @@ return [ 'tables-visualisation' => 'Tables (visualisation)', ], ], 'type-intervention' => [ 'libelle' => 'Type d\'intervention', 'privileges' => [ Loading @@ -253,6 +258,7 @@ return [ 'edition' => 'Édition', ], ], 'type-ressource' => [ 'libelle' => 'Types de ressources', 'privileges' => [ Loading @@ -261,14 +267,6 @@ return [ ], ], 'unicaen-tbl' => [ 'libelle' => 'Tableaux de bord', 'privileges' => [ 'admin' => 'Gestion des tableaux de bord', 'actualisation' => 'Actualisation', ], ], 'modulateur' => [ 'libelle' => 'Modulateurs', 'privileges' => [ Loading Loading @@ -424,6 +422,7 @@ return [ 'tests' => 'Tests', ], ], 'referentiel-commun' => [ 'libelle' => 'Référentiels communs', 'privileges' => [ Loading @@ -433,6 +432,7 @@ return [ 'employeur-edition' => 'Édition employeurs', ], ], 'nomenclature-rh' => [ 'libelle' => 'Nomenclature RH', 'privileges' => [ Loading
module/Application/config/intervenant.config.php +8 −4 Changes for module/Application/config/intervenant.config.php: 8 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -479,8 +479,10 @@ return [ 'controller' => 'Application\Controller\Intervenant', 'action' => ['services'], 'privileges' => [ Privileges::ENSEIGNEMENT_VISUALISATION, Privileges::REFERENTIEL_VISUALISATION, Privileges::ENSEIGNEMENT_PREVU_VISUALISATION, Privileges::ENSEIGNEMENT_REALISE_VISUALISATION, Privileges::REFERENTIEL_PREVU_VISUALISATION, Privileges::REFERENTIEL_REALISE_VISUALISATION, ], 'assertion' => Assertion\ServiceAssertion::class, ], Loading Loading @@ -540,8 +542,10 @@ return [ 'controller' => 'Application\Controller\Intervenant', 'action' => ['formule-totaux-hetd'], 'privileges' => [ Privileges::ENSEIGNEMENT_VISUALISATION, Privileges::REFERENTIEL_VISUALISATION, Privileges::ENSEIGNEMENT_PREVU_VISUALISATION, Privileges::ENSEIGNEMENT_REALISE_VISUALISATION, Privileges::REFERENTIEL_PREVU_VISUALISATION, Privileges::REFERENTIEL_REALISE_VISUALISATION, ], ], [ Loading