From ec14e559af2bd1d25f7c3549477ea8d29d4de64d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Wed, 9 Jun 2021 14:50:59 +0200
Subject: [PATCH] Fix bug application-bloc et competence-bloc lorsque l'element
est une formation
---
.../View/Helper/partial/application-bloc.phtml | 10 ++++++++--
.../View/Helper/partial/competence-bloc.phtml | 10 ++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/module/Application/src/Application/View/Helper/partial/application-bloc.phtml b/module/Application/src/Application/View/Helper/partial/application-bloc.phtml
index 2b2122ee7..89f29cac8 100644
--- a/module/Application/src/Application/View/Helper/partial/application-bloc.phtml
+++ b/module/Application/src/Application/View/Helper/partial/application-bloc.phtml
@@ -10,6 +10,7 @@ use Application\Provider\Privilege\AgentPrivileges;
use Application\Provider\Privilege\FicheMetierPrivileges;
use Application\View\Helper\CompetenceBlocViewHelper;
use Formation\Entity\Db\Formation;
+use Formation\Provider\Privilege\FormationPrivileges;
/**
* @see \Application\View\Helper\ApplicationBlocViewHelper
@@ -40,8 +41,13 @@ if ($objet instanceof FicheMetier) {
$canAcquisAfficher = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_AFFICHER));
$canAcquisModifier = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_MODIFIER));
} else {
- $canAcquisAfficher = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_AFFICHER);
- $canAcquisModifier = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_MODIFIER);
+ if ($objet instanceof Formation) {
+ $canAcquisAfficher = $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_AFFICHER));
+ $canAcquisModifier = $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_MODIFIER));
+ } else {
+ $canAcquisAfficher = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_AFFICHER);
+ $canAcquisModifier = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_MODIFIER);
+ }
}
$canAfficher = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher') AND $canAcquisAfficher);
diff --git a/module/Application/src/Application/View/Helper/partial/competence-bloc.phtml b/module/Application/src/Application/View/Helper/partial/competence-bloc.phtml
index e30d736dc..15928fe87 100644
--- a/module/Application/src/Application/View/Helper/partial/competence-bloc.phtml
+++ b/module/Application/src/Application/View/Helper/partial/competence-bloc.phtml
@@ -12,6 +12,7 @@ use Application\Provider\Privilege\CompetencePrivileges;
use Application\Provider\Privilege\FicheMetierPrivileges;
use Application\View\Helper\CompetenceBlocViewHelper;
use Formation\Entity\Db\Formation;
+use Formation\Provider\Privilege\FormationPrivileges;
/**
* @see \Application\View\Helper\CompetenceBlocViewHelper
@@ -42,8 +43,13 @@ if ($objet instanceof FicheMetier) {
$canAcquisAfficher = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_AFFICHER));
$canAcquisModifier = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_MODIFIER));
} else {
- $canAcquisAfficher = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_AFFICHER);
- $canAcquisModifier = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_MODIFIER);
+ if ($objet instanceof Formation) {
+ $canAcquisAfficher = $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_AFFICHER));
+ $canAcquisModifier = $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_MODIFIER));
+ } else {
+ $canAcquisAfficher = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_AFFICHER);
+ $canAcquisModifier = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_MODIFIER);
+ }
}
$canAfficher = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher') AND $canAcquisAfficher);
--
GitLab