Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OSE
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
OSE
Merge requests
!95
Affichage distinct des enseignements dans la fiche de service
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Affichage distinct des enseignements dans la fiche de service
cherry-pick-6c929bc1
into
master
Overview
0
Commits
1
Pipelines
0
Changes
2
Merged
Affichage distinct des enseignements dans la fiche de service
Laurent Lecluse
requested to merge
cherry-pick-6c929bc1
into
master
Nov 22, 2021
Overview
0
Commits
1
Pipelines
0
Changes
2
(cherry picked from commit
6c929bc1
)
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
0022a5e5
1 commit,
Nov 22, 2021
2 files
+
7
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
module/Application/src/Application/Controller/IntervenantController.php
+
2
−
1
View file @ 0022a5e5
Edit in single-file editor
Open in Web IDE
Show full file
@@ -160,6 +160,7 @@ class IntervenantController extends AbstractController
$this
->
em
()
->
getFilters
()
->
enable
(
'historique'
)
->
init
([
\Application\Entity\Db\Service
::
class
,
\Application\Entity\Db\VolumeHoraire
::
class
,
\Application\Entity\Db\CheminPedagogique
::
class
,
\Application\Entity\Db\ServiceReferentiel
::
class
,
\Application\Entity\Db\VolumeHoraireReferentiel
::
class
,
\Application\Entity\Db\Validation
::
class
,
@@ -191,7 +192,7 @@ class IntervenantController extends AbstractController
$campagneSaisie
=
$this
->
getServiceCampagneSaisie
()
->
getBy
(
$intervenant
->
getStatut
()
->
getTypeIntervenant
(),
$typeVolumeHoraire
);
if
(
!
$campagneSaisie
->
estOuverte
())
{
$role
=
$this
->
getServiceContext
()
->
getSelectedIdentityRole
();
if
(
$role
->
getIntervenant
())
{
Loading