Merge branch 'fix-filtre-these-financement' into test (c35584a9) · Commits · open-source / sygal

module/Application/config/others/substitution.config.php

+3 −2

Changes for module/Application/config/others/substitution.config.php: 3 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		use Application\Controller\Factory\SubstitutionControllerFactory;
		use Application\Provider\Privilege\StructurePrivileges;
		use Application\Provider\Privilege\SubstitutionPrivileges;
		use UnicaenAuth\Guard\PrivilegeController;
		use Zend\Mvc\Router\Http\Segment;

		@@ -156,8 +157,8 @@ return [
		'substitution' => [
		'label' => 'Substitutions',
		'route' => 'substitution-index',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Admin', 'index'),

		// 'resource' => PrivilegeController::getResourceId('Application\Controller\Admin', 'index'),
		'resource' => SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_CONSULTATION_ECOLE),
		'order' => 50,
		],
		],

+1 −1

Changes for module/Application/src/Application/Service/These/Filter/TheseSelectFilter.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ class TheseSelectFilter extends TheseFilter
		->andWhere('orig.id IS NULL');
		} else {
		$qb
		->andWhere('origine.id = :origine')
		->andWhere('orig.id = :origine')
		->setParameter('origine', $filterValue);
		}
		break;