Merge branch 'jury-simulation-remonter' into release_3.0.0 (bbb7f245) · Commits · open-source / sygal

doc/release-notes/v3.0.1.md

0 → 100644

+6 −0

Changes for doc/release-notes/v3.0.1.md: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		```SQL
		INSERT INTO privilege (id, categorie_id, code, libelle, ordre) values (privilege_id_seq.nextval, 101, 'simuler_remontees', 'Simulation des remontées du jury du SI', 123456);
		```

		Penser a modifier les profil en conséquence

+10 −4

Changes for module/Application/src/Application/Assertion/These/TheseControllerAssertion.php: 10 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -62,19 +62,25 @@ class TheseControllerAssertion extends ControllerAssertion
		return true;
		}

		protected function assertAsDoctorant()
		protected function assertAsDoctorant(): bool
		{
		if ($this->getIdentityDoctorant() === null) {
		$identityDoctorant = $this->getIdentityDoctorant();

		if ($identityDoctorant === null) {
		throw new RuntimeException("Anomalie: le role doctorant est sélectionné mais aucune donnée d'identité doctorant n'est disponible");
		}

		switch (true) {
		case $this->actionIs(self::DOCTORANT_CONTROLLER, 'modifier-persopass'):
		return $this->doctorant && $this->doctorant->getId() === $this->getIdentityDoctorant()->getId();
		return $this->doctorant && $this->doctorant->getId() === $identityDoctorant->getId();
		break;
		}

		return $this->these && $this->these->getDoctorant()->getId() === $this->getIdentityDoctorant()->getId();
		if ($this->these === null) {
		return true;
		}

		return $this->these->getDoctorant()->getId() === $identityDoctorant->getId();
		}

		/**

+1 −1

Changes for module/Application/src/Application/Service/Utilisateur/UtilisateurService.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -283,7 +283,7 @@ class UtilisateurService extends BaseService
		* @param string $param
		* @return Utilisateur\|null
		*/
		public function getRequestedUtilisateur(AbstractActionController $controller, string $param = "user") : ?Utilisateur
		public function getRequestedUtilisateur(AbstractActionController $controller, string $param = "utilisateur") : ?Utilisateur
		{
		$id = $controller->params()->fromRoute($param);
		/** @var Utilisateur $result */

+1 −2

Changes for module/Application/view/layout/layout.phtml: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -25,8 +25,7 @@ $identity = $this->zfcUserIdentity();
		<!-- Links -->
		<?php echo $this->headLink(array(
		'rel' => 'shortcut icon',
		'type' => 'image/vnd.microsoft.icon',
		'href' => '//www.unicaen.fr/images/favicon.ico')) ?>
		'href' => '//www.unicaen.fr/favicon.ico')) ?>

		<!-- Scripts -->
		<?php echo $this->headScript(); ?>

+30 −0

Changes for module/Soutenance/config/others/presoutenance.config.php: 30 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -45,6 +45,14 @@ return [
		],
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => PresoutenanceController::class,
		'action' => [
		'generer-simulation',
		'nettoyer-simulation',
		],
		'privileges' => PresoutenancePrivileges::PRESOUTENANCE_SIMULER_REMONTEES,
		],
		[
		'controller' => PresoutenanceController::class,
		'action' => [
		@@ -134,6 +142,28 @@ return [
		],
		],
		'child_routes' => [
		'generer-simulation' => [
		'type' => Segment::class,
		'may_terminate' => true,
		'options' => [
		'route' => '/generer-simulation',
		'defaults' => [
		'controller' => PresoutenanceController::class,
		'action' => 'generer-simulation',
		],
		],
		],
		'nettoyer-simulation' => [
		'type' => Segment::class,
		'may_terminate' => true,
		'options' => [
		'route' => '/nettoyer-simulation',
		'defaults' => [
		'controller' => PresoutenanceController::class,
		'action' => 'nettoyer-simulation',
		],
		],
		],
		'avis-soutenance' => [
		'type' => Segment::class,
		'may_terminate' => true,