From 2cee36fd6b6e1cc8e21d3dbb01f90a366125c0f0 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Thu, 24 Jan 2013 08:34:51 +0000
Subject: [PATCH] Correction lien pour ouvrir les sous menus d'un menu vertical
---
library/Class/Systeme/ModulesMenu.php | 1 +
library/Class/Systeme/ModulesMenu/Menu.php | 7 ++--
.../View/Helper/Accueil/MenuVerticalTest.php | 36 +++++++++++++++++++
3 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/library/Class/Systeme/ModulesMenu.php b/library/Class/Systeme/ModulesMenu.php
index 04f091e876d..b9b5a3c3a90 100644
--- a/library/Class/Systeme/ModulesMenu.php
+++ b/library/Class/Systeme/ModulesMenu.php
@@ -86,6 +86,7 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract {
static::$_modules = [
"vide" => new Class_Systeme_ModulesMenu_Null(),
+ "MENU" => new Class_Systeme_ModulesMenu_Menu(),
"ACCUEIL" => new Class_Systeme_ModulesMenu_Accueil(),
"CONNECT" => new Class_Systeme_ModulesMenu_Connect(),
"DISCONNECT" => new Class_Systeme_ModulesMenu_Disconnect(),
diff --git a/library/Class/Systeme/ModulesMenu/Menu.php b/library/Class/Systeme/ModulesMenu/Menu.php
index 85150e1bd2e..cdcc9481226 100644
--- a/library/Class/Systeme/ModulesMenu/Menu.php
+++ b/library/Class/Systeme/ModulesMenu/Menu.php
@@ -19,11 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class Class_Systeme_ModulesMenu_Menu extends Class_Systeme_ModulesMenu_Null {
- /** @var string */
- protected $_url = '#';
-
/** @var string */
protected $_libelle = 'Menu';
+
+ public function getUrl() {
+ return '#';
+ }
}
?>
\ No newline at end of file
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/MenuVerticalTest.php b/tests/library/ZendAfi/View/Helper/Accueil/MenuVerticalTest.php
index 4f11199758b..de1cf075ac3 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/MenuVerticalTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/MenuVerticalTest.php
@@ -369,4 +369,40 @@ class MenuVerticalAlbumTest extends MenuVerticalTestCase {
function menuShouldNotContainsEntryToSecondPage() {
$this->assertNotXPath($this->_html,'//ul/li/ul//li//a[contains(@href, "/bib-numerique/booklet/id/41/#/page/2")]', $this->_html);
}
+}
+
+
+
+
+class MenuVerticalWithMenuTest extends MenuVerticalTestCase {
+ protected function _menuConfigTrigger() {
+ Class_Profil::getCurrentProfil()->setCfgMenus(
+ [
+ 7 => ['libelle' => 'Menu vertical',
+ 'menus' => [
+ [
+ 'type_menu' => 'MENU',
+ 'libelle' => 'Menu',
+ 'picto' => 'vide.gif',
+ 'preferences' => [],
+ 'sous_menus' => [['type_menu' => 'RSS',
+ 'libelle' => 'Bulletin electronique',
+ 'picto' => 'vide.gif',
+ 'preferences' => [
+ 'id_categorie' => '',
+ 'id_items' => '46',
+ 'nb' => '10' ]]
+ ]
+ ],
+ ]
+ ]
+ ]
+ );
+ }
+
+
+ /** @test */
+ public function menuLinkShouldBeSharp() {
+ $this->assertXPathContentContains($this->_html, '//ul/li/a[@href="#"]', 'Menu');
+ }
}
\ No newline at end of file
--
GitLab