diff --git a/composer.json b/composer.json index a8fdb4dd02ed8f2d29b10eb73d42247da9627335..bc777d4aa808778cae434bc75ed91fc24111bab6 100755 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ "unicaen/app": "^4|^5|^6", "unicaen/utilisateur": "^4|^5|^6", "unicaen/privilege": "^4|^5|^6", - "unicaen/mail": "^5|^6" + "unicaen/mail": "^5|^6", + "unicaen/console": "^6" }, "autoload": { "psr-0": [], diff --git a/config/merged/abonnement.config.php b/config/merged/abonnement.config.php index 18797c537069279bddd178f73909811501fe8efc..b8763175a91512ff10b3645e56f442dead06120b 100644 --- a/config/merged/abonnement.config.php +++ b/config/merged/abonnement.config.php @@ -1,12 +1,13 @@ <?php +use Unicaen\Console\Router\Simple; use UnicaenIndicateur\Controller\AbonnementController; use UnicaenIndicateur\Controller\AbonnementControllerFactory; use UnicaenIndicateur\Provider\Privilege\AbonnementPrivileges; use UnicaenIndicateur\Service\Abonnement\AbonnementService; use UnicaenIndicateur\Service\Abonnement\AbonnementServiceFactory; use UnicaenPrivilege\Guard\PrivilegeController; -use Laminas\Mvc\Console\Router\Simple; + use Laminas\Router\Http\Literal; use Laminas\Router\Http\Segment; diff --git a/config/merged/indicateur.config.php b/config/merged/indicateur.config.php index bc1412d930cd7460de51cc004bf9029cef32a31f..8308299a92740da86f1c8fd2a59d9a1cde27b04f 100644 --- a/config/merged/indicateur.config.php +++ b/config/merged/indicateur.config.php @@ -12,7 +12,7 @@ use UnicaenIndicateur\Service\Indicateur\IndicateurServiceFactory; use UnicaenIndicateur\View\Helper\DefaultItemViewHelper; use UnicaenIndicateur\View\Helper\IndicateurViewHelperFactory; use UnicaenPrivilege\Guard\PrivilegeController; -use Laminas\Mvc\Console\Router\Simple; +use Unicaen\Console\Router\Simple; use Laminas\Router\Http\Literal; use Laminas\Router\Http\Segment; diff --git a/config/module.config.php b/config/module.config.php index c9caba6d663c24ab34858acf9db126881974eb9a..286646fc799c74a6a949c3ce536eee08de38515f 100644 --- a/config/module.config.php +++ b/config/module.config.php @@ -1,7 +1,7 @@ <?php -use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\ORM\Mapping\Driver\XmlDriver; +use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use UnicaenIndicateur\Provider\Privilege\IndicateurPrivileges; use UnicaenPrivilege\Guard\PrivilegeController; diff --git a/documentation/01_table.sql b/documentation/01_table.sql index 820171e3a9688561e319386bbeaf9d8a4b6bfcfa..343012e985dbc33ff40443332a2811d9f833a1ae 100644 --- a/documentation/01_table.sql +++ b/documentation/01_table.sql @@ -7,7 +7,8 @@ create table unicaen_indicateur_indicateur requete varchar(4096) not null, dernier_rafraichissement timestamp, view_id varchar(256), - entity varchar(256) + entity varchar(256), + namespace varchar(1024) ); create table unicaen_indicateur_abonnement diff --git a/src/UnicaenIndicateur/Controller/IndicateurController.php b/src/UnicaenIndicateur/Controller/IndicateurController.php index d61e8b208f0d7374d37c2c2452dccf75fc9b1190..cfb8ab881e2c6e3655f78afbdc58cb6ad25da815 100644 --- a/src/UnicaenIndicateur/Controller/IndicateurController.php +++ b/src/UnicaenIndicateur/Controller/IndicateurController.php @@ -103,7 +103,7 @@ class IndicateurController extends AbstractActionController { $namespace = $this->params()->fromQuery('namespace'); $form = $this->getIndicateurForm(); - $form->setAttribute('action', $this->url()->fromRoute('indicateur/modifier', ['indicateur' => $indicateur], ['query' => ['namespace' => $namespace]], true)); + $form->setAttribute('action', $this->url()->fromRoute('indicateur/modifier', ['indicateur' => $indicateur->getId()], ['query' => ['namespace' => $namespace]], true)); if ($namespace) { $indicateur->setNamespace($namespace); $form->get('namespace')->setAttribute('readonly', true); diff --git a/view/unicaen-indicateur/indicateur/index.phtml b/view/unicaen-indicateur/indicateur/index.phtml index 23aaee039e4b8adce01bc588542a014d1e453bba..9632ef5754489b8497375e37545a3099964867bb 100644 --- a/view/unicaen-indicateur/indicateur/index.phtml +++ b/view/unicaen-indicateur/indicateur/index.phtml @@ -74,7 +74,7 @@ $canTableaux = $this->isAllowed(TableaudebordPrivileges::getResourceId(Tableaude <td> <?php echo $indicateur->getEntity(); ?> </td> <td> <?php echo count($indicateur->getAbonnements()); ?> - <?php if ($abonnements[$indicateur->getId()]) : ?> + <?php if (isset($abonnements[$indicateur->getId()])) : ?> <?php /** @see AbonnementController::resilierAction() */?> <a href="<?php echo $this->url("abonnement/resilier", ['indicateur' => $indicateur->getId()], [], true); ?>"> <span class="icon icon-checked" style="color:darkgreen;" title="Vous êtes abonné·e à cet indicateur"></span>