From f77dd2041b7858eadf9fc6cd5701e4802779601c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20L=C3=A9cluse?= <laurent.lecluse@unicaen.fr>
Date: Fri, 16 Mar 2018 12:07:34 +0100
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20la=20config=20pour?=
=?UTF-8?q?=20permettre=20la=20g=C3=A9n=C3=A9ration=20en=20console=20avec?=
=?UTF-8?q?=20UnicaenCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
composer.json | 1 +
config/application.config.php | 3 +++
module/Application/Module.php | 4 +---
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/composer.json b/composer.json
index dade2e034f..0e0260b92c 100755
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,7 @@
"unicaen/app": "dev-master as 1.3.6",
"unicaen/auth": "dev-master",
"zendframework/zend-code": "^2.4",
+ "zendframework/zend-text": "^2.4",
"bjyoungblood/bjy-authorize": "dev-master",
"zf-commons/zfc-user": "0.1.3",
"zendframework/zend-file": "^2.4",
diff --git a/config/application.config.php b/config/application.config.php
index fe8a0235a7..eb6c9a9e80 100755
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -73,6 +73,9 @@ class AppConfig
if ('development' == $env) {
$modules[] = 'ZendDeveloperTools';
+ }
+
+ if (\Zend\Console\Console::isConsole() || 'development' == $env){
$modules[] = 'UnicaenCode';
}
diff --git a/module/Application/Module.php b/module/Application/Module.php
index 82b21a6776..602bca4c3f 100755
--- a/module/Application/Module.php
+++ b/module/Application/Module.php
@@ -46,7 +46,7 @@ class Module implements ConsoleUsageProviderInterface, ConsoleBannerProviderInte
/* Utilise un layout spécial si on est en AJAX. Valable pour TOUS les modules de l'application */
$eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch',
function (\Zend\Mvc\MvcEvent $e) {
- if ($e->getRequest()->isXmlHttpRequest()) {
+ if ($e->getRequest() instanceof \Zend\Http\Request && $e->getRequest()->isXmlHttpRequest()) {
$e->getTarget()->layout('application/ajax-layout.phtml');
}
}
@@ -161,8 +161,6 @@ class Module implements ConsoleUsageProviderInterface, ConsoleBannerProviderInte
"Notifications",
'notifier indicateurs [--force]' => "Notification par mail des personnes abonnées à des indicateurs",
['--force', "Facultatif", "Envoie les mails sytématiquement, sans tenir compte de la fréquence de notification."],
- ['--requestUriHost', "Obligatoire", "Exemples: \"/ose.unicaen.fr\", \"/test.unicaen.fr/ose\"."],
- ['--requestUriScheme', "Facultatif", "Exemples: \"http\" (par défaut), \"https\"."],
];
}
--
GitLab