Commit 272de5e9 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Correction assertion merdant sur des fiche metier

parent 41c3e0c6

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

+10 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Entity\Db\ApplicationElement; 
use Application\Entity\Db\FicheMetier;

use Application\Entity\Db\Interfaces\HasCompetenceCollectionInterface;

use Application\Provider\Privilege\AgentPrivileges;

use Application\Provider\Privilege\FicheMetierPrivileges;

use Application\View\Helper\CompetenceBlocViewHelper;

use Formation\Entity\Db\Formation;
@@ -33,8 +34,15 @@ use Formation\Entity\Db\Formation; 
 */



//var_dump($options);

$canAcquisAfficher = false;

$canAcquisModifier = false;

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

}



$canAfficher        = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher')  AND $canAcquisAfficher);

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

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

+10 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ use Application\Entity\Db\FicheMetier; 
use Application\Entity\Db\Interfaces\HasCompetenceCollectionInterface;

use Application\Provider\Privilege\AgentPrivileges;

use Application\Provider\Privilege\CompetencePrivileges;

use Application\Provider\Privilege\FicheMetierPrivileges;

use Application\View\Helper\CompetenceBlocViewHelper;

use Formation\Entity\Db\Formation;
@@ -35,8 +36,15 @@ use Formation\Entity\Db\Formation; 
 *  ]

 */



$canAcquisAfficher = false;

$canAcquisModifier = false;

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

}



$canAfficher        = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher')  AND $canAcquisAfficher);

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

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

+11 −2
Original line number Diff line number Diff line 
<?php



use Application\Controller\ElementController;

use Application\Entity\Db\FicheMetier;

use Application\Provider\Privilege\AgentPrivileges;

use Application\Provider\Privilege\FicheMetierPrivileges;

use Application\View\Helper\CompetenceBlocViewHelper;

use Formation\Entity\Db\Formation;

use Formation\Entity\Db\FormationElement;
@@ -28,8 +30,15 @@ use Formation\Entity\Db\Interfaces\HasFormationCollectionInterface; 
 *      ...

 *  ]

 */

$canAcquisAfficher = false;

$canAcquisModifier = false;

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

}



$canAfficher        = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher')  AND $canAcquisAfficher);

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

module/Application/view/layout/navigation-octopus.phtml

+17 −2
Original line number Diff line number Diff line 
<?php



use Zend\Navigation\AbstractContainer;

use Zend\Navigation\Page\AbstractPage;



// Pointeur sur la première page du conteneur

$this->container->rewind();

// On récupère le conteneur en-dessous du 'home'

/** @var AbstractContainer $container */

$container = $this->container->getChildren();



// tri des pages de niveau 1 par 'order'

$sorterByOrder = function(AbstractPage $p1, AbstractPage $p2) { return ($p1->getOrder()?:0) <=> ($p2->getOrder()?:0); };

$pagesNiv1 = iterator_to_array($container);

uasort($pagesNiv1, $sorterByOrder);

?>

<ul class="<?php echo $this->navigation()->menu()->getUlClass(); ?>">

    <?php foreach ($container as $page): ?>

    <?php foreach ($pagesNiv1 as $page): ?>

        <?php if (!$this->navigation()->accept($page)) continue; ?>

        <?php /* @var $page Zend\Navigation\Page\Mvc */ ?>

        <?php $hasChildren = $page->hasPages() ?>
@@ -43,7 +53,12 @@ $container = $this->container->getChildren(); 
<!--                        <b class="caret"></b>-->

                    </a>

                    <ul class="dropdown-menu">

                        <?php foreach ($page->getPages() as $child): ?>

                        <?php

                        // tri des pages de niveau 2 par 'order'

                        $pagesNiv2 = $page->getPages();

                        uasort($pagesNiv2, $sorterByOrder);

                        ?>

                        <?php foreach ($pagesNiv2 as $child): ?>

                            <?php if (!$this->navigation()->accept($child)) continue; ?>

                            <?php if ($child->get("dropdown-header") === true): ?>

                                <li role="presentation" class="dropdown-header">