diff --git a/composer.json b/composer.json index 2d6db5f1fe19b35c1cc7cb4400762ec3a40acd04..543a740605fb0072b335c2d58f87853f14b7cdff 100755 --- a/composer.json +++ b/composer.json @@ -12,8 +12,9 @@ "unicaen/privilege": "^5.0", "laminas/laminas-dependency-plugin": "^2.1" }, + "minimum-stability": "dev", + "prefer-stable": true, "autoload": { - "psr-0": [], "classmap": [ "./Module.php" ] diff --git a/config/module.config.php b/config/module.config.php index dead40405d07aed8c95aa434ea21d6465b988971..0622da979e703c792f4d4974c661ca91ed61e12b 100755 --- a/config/module.config.php +++ b/config/module.config.php @@ -1,6 +1,6 @@ <?php -use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; +use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\ORM\Mapping\Driver\XmlDriver; use UnicaenPrivilege\Guard\PrivilegeController; use UnicaenRenderer\Controller\MacroController; diff --git a/readme.md b/readme.md index 41a01f17a427adda66e12fe53043080e29e57fe7..683555283b34ab985c27caec1ffaaa88c67121b7 100755 --- a/readme.md +++ b/readme.md @@ -40,6 +40,7 @@ alter table unicaen_renderer_template add namespace varchar(1024); Dépendance à **UnicaenPrivilege** ---------------------------------- + 1. Dans **vendor/unicaen/renderer/config/merged/index.config.php**, **vendor/unicaen/renderer/config/merged/macro.config.php**, **vendor/unicaen/renderer/config/merged/rendu.config.php**, **vendor/unicaen/renderer/config/merged/template.config.php** : `UnicaenPrivilege\Guard\PrivilegeController` pour les gardes liées aux actions. Peut être directement remplacer par l'equivalent fournit par `unicaen/auth`. diff --git a/view/unicaen-renderer/rendu/index.phtml b/view/unicaen-renderer/rendu/index.phtml index d018cbf4a3a2484c707b22e8d2d78bdd6dc481ca..58e77a5119180cb47665441dfe91a4054f2e4bea 100644 --- a/view/unicaen-renderer/rendu/index.phtml +++ b/view/unicaen-renderer/rendu/index.phtml @@ -7,17 +7,17 @@ use UnicaenRenderer\Provider\Privilege\DocumenttemplatePrivileges; /** * @see \UnicaenRenderer\Controller\RenduController::indexAction() - * @var string $title * @var Rendu[] $rendus + * @var string $title */ -$this->headTitle($title); - -$canMacro = $this->isAllowed(DocumentmacroPrivileges::getResourceId(DocumentmacroPrivileges::DOCUMENTMACRO_INDEX)); -$canTemplate = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_INDEX)); +$this->headTitle("Index des contenus"); $canVoir = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(DocumentcontenuPrivileges::DOCUMENTCONTENU_AFFICHER)); $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(DocumentcontenuPrivileges::DOCUMENTCONTENU_SUPPRIMER)); + +$canMacro = $this->isAllowed(DocumentmacroPrivileges::getResourceId(DocumentmacroPrivileges::DOCUMENTMACRO_INDEX)); +$canTemplate = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_INDEX)); ?> <div class="row"> @@ -55,7 +55,7 @@ $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Docume <tbody> <?php foreach ($rendus as $rendu) : ?> <tr> - <td> #<?php echo $rendu->getId(); ?> </td> + <td> <?php echo $rendu->getId(); ?> </td> <td> <?php if ($rendu->getTemplate()) : ?> <?php echo $rendu->getTemplate()->getCode(); ?> @@ -63,13 +63,13 @@ $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Docume </td> <td> <?php echo $rendu->getDate()->format('d/m/Y à H:i:s'); ?> </td> <td> - <span title="<?php echo $rendu->getSujet(); ?>" data-bs-toggle="tooltip" data-bs-html="true"> - <?php - $sujet = $rendu->getSujet(); - if (strlen($sujet) > 50) $sujet = substr($rendu->getSujet(), 0, 46) . " ..."; - echo $sujet; - ?> - </span> + <span title="<?php echo $rendu->getSujet(); ?>" data-toggle="tooltip" data-html="true"> + <?php + $sujet = $rendu->getSujet(); + if (strlen($sujet) > 50) $sujet = substr($rendu->getSujet(), 0, 46) . " ..."; + echo $sujet; + ?> + </span> </td> <td class="text-end"> <?php if ($canVoir) : ?> diff --git a/view/unicaen-renderer/template/index.phtml b/view/unicaen-renderer/template/index.phtml index efce70e5cf655f1773c75eb41b5bafb6cb01e355..514f1c4dcddec7fdbc50863e861fbdb449e4016a 100755 --- a/view/unicaen-renderer/template/index.phtml +++ b/view/unicaen-renderer/template/index.phtml @@ -125,7 +125,7 @@ $this->headTitle($title); <i>Aucun namespace</i> <?php endif; ?> </td> - <td class="text-end"> + <td> <?php if ($canAfficher) : ?> <?php /** @see \UnicaenRenderer\Controller\TemplateController::afficherAction() */ ?> <a href="<?php echo $this->url('contenu/template/afficher', ['template' => $template->getId()], [], true); ?>"