Commit 03da5185 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'master' into release_1.1.5

parents 9b3620bc ec14e559

module/Application/src/Application/Entity/Db/MacroContent/FichePosteMacroTrait.php

+6 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ trait FichePosteMacroTrait { 
    {

        /** @var FichePoste $ficheposte */

        $ficheposte = $this;

        if ($ficheposte->getSpecificite() === null) return '';

        $specificite = $ficheposte->getSpecificite()->getSpecificite();



        $texte = "";
@@ -450,6 +451,7 @@ trait FichePosteMacroTrait { 
    {

        /** @var FichePoste $ficheposte */

        $ficheposte = $this;

        if ($ficheposte->getSpecificite() === null) return '';

        $encadrement = $ficheposte->getSpecificite()->getEncadrement();



        $texte = "";
@@ -469,6 +471,7 @@ trait FichePosteMacroTrait { 
    {

        /** @var FichePoste $ficheposte */

        $ficheposte = $this;

        if ($ficheposte->getSpecificite() === null) return '';

        $relationsInternes = $ficheposte->getSpecificite()->getRelationsInternes();

        $relationsExternes = $ficheposte->getSpecificite()->getRelationsExternes();
@@ -494,6 +497,7 @@ trait FichePosteMacroTrait { 
    {

        /** @var FichePoste $ficheposte */

        $ficheposte = $this;

        if ($ficheposte->getSpecificite() === null) return '';

        $contraintes = $ficheposte->getSpecificite()->getContraintes();



        $texte = "";
@@ -513,6 +517,7 @@ trait FichePosteMacroTrait { 
    {

        /** @var FichePoste $ficheposte */

        $ficheposte = $this;

        if ($ficheposte->getSpecificite() === null) return '';

        $moyens = $ficheposte->getSpecificite()->getMoyens();



        $texte = "";
@@ -532,6 +537,7 @@ trait FichePosteMacroTrait { 
    {

        /** @var FichePoste $ficheposte */

        $ficheposte = $this;

        if ($ficheposte->getSpecificite() === null) return '';

        $formations = $ficheposte->getSpecificite()->getFormations();



        $texte = "";

module/Application/src/Application/View/Helper/partial/application-bloc.phtml

+8 −2
Original line number Diff line number Diff line
@@ -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
@@ -39,10 +40,15 @@ $canAcquisModifier = false; 
if ($objet instanceof FicheMetier) {

    $canAcquisAfficher = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_AFFICHER));

    $canAcquisModifier = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_MODIFIER));

} else {

    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);

$canAjouter         = (CompetenceBlocViewHelper::isActionActivee($options, 'ajouter')   AND $canAcquisModifier);

module/Application/src/Application/View/Helper/partial/competence-bloc.phtml

+8 −2
Original line number Diff line number Diff line
@@ -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
@@ -41,10 +42,15 @@ $canAcquisModifier = false; 
if ($objet instanceof FicheMetier) {

    $canAcquisAfficher = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_AFFICHER));

    $canAcquisModifier = $this->isAllowed(FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_MODIFIER));

} else {

    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);

$canAjouter         = (CompetenceBlocViewHelper::isActionActivee($options, 'ajouter')   AND $canAcquisModifier);

module/Application/view/application/structure/partial/profil.phtml

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ ksort($fichesRecrutements) 
                    <span class="icon ko" style="color:darkred;" title="Il ne s'agit pas d'une vacance d'emploi" data-toggle="tooltip" data-html="true"></span>

                <?php endif; ?>

            </td>

            <td> <?php echo $profil->getDate()->format('d/m/Y'); ?> </td>

            <td> <?php echo $profil->getDateDossier()->format('d/m/Y'); ?> </td>

            <td>

                <?php if ($canExporter) : ?>

                    <?php /** @see \Application\Controller\FicheProfilController::exporterAction() */?>