From 2af97a82caa445871ccd84da652d6678d84acede Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 17 Sep 2012 08:52:54 +0000
Subject: [PATCH] =?UTF-8?q?Bib=20num=20audio=20/=20t=C3=A9l=C3=A9phone:=20?=
=?UTF-8?q?le=20lecteur=20multim=C3=A9dia=20se=20lance?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/scripts/bib-numerique/view-categorie.phtml | 3 ++-
.../ZendAfi/View/Helper/Accueil/BibNumerique/TreeRenderer.php | 2 +-
.../telephone/controllers/BibNumeriqueControllerTest.php | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/application/modules/telephone/views/scripts/bib-numerique/view-categorie.phtml b/application/modules/telephone/views/scripts/bib-numerique/view-categorie.phtml
index 3cc0456c11a..adbef057066 100644
--- a/application/modules/telephone/views/scripts/bib-numerique/view-categorie.phtml
+++ b/application/modules/telephone/views/scripts/bib-numerique/view-categorie.phtml
@@ -5,6 +5,7 @@
<?php foreach($this->albums as $album) { ?>
<li><?php echo $this->tagAnchor($this->url(array('action' => 'view-album',
'id' => $album->getId())),
- $album->getTitre());?></li>
+ $album->getTitre(),
+ ['data-ajax' => 'false']);?></li>
<?php } ?>
</ul>
diff --git a/library/ZendAfi/View/Helper/Accueil/BibNumerique/TreeRenderer.php b/library/ZendAfi/View/Helper/Accueil/BibNumerique/TreeRenderer.php
index 881c74f392a..df3d6727f5b 100644
--- a/library/ZendAfi/View/Helper/Accueil/BibNumerique/TreeRenderer.php
+++ b/library/ZendAfi/View/Helper/Accueil/BibNumerique/TreeRenderer.php
@@ -104,7 +104,7 @@ class ZendAfi_View_Helper_Accueil_BibNumerique_TreeRenderer {
if (0 < count($albums = $categorie->getAlbums())) {
$content .= '<ul>';
foreach ($albums as $album) {
- $options = ($this->_isCurrentAlbum($album)) ? array('class' => 'selected') : array();
+ $options = ($this->_isCurrentAlbum($album)) ? ['class' => 'selected'] : [];
$content .= '<li>' . $this->_getLinkedItemFor($album, 'view-album', $options) . '</li>';
}
$content .= '</ul>';
diff --git a/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php b/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php
index 95bb7131d6c..45c3f63c5a0 100644
--- a/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php
+++ b/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php
@@ -57,13 +57,13 @@ class BibNumeriqueControllerTelephoneViewCategorieEPUBTest extends BibNumeriqueC
/** @test */
public function liShouldContainsLinkToAlbumMonuments() {
- $this->assertXPathContentContains('//li/a[contains(@href, "bib-numerique/view-album/id/234")]', 'Monuments');
+ $this->assertXPathContentContains('//li/a[contains(@href, "bib-numerique/view-album/id/234")][@data-ajax="false"]', 'Monuments');
}
/** @test */
public function liShouldContainsLinkToAlbumHistoires() {
- $this->assertXPathContentContains('//li/a[contains(@href, "bib-numerique/view-album/id/567")]', 'Histoires');
+ $this->assertXPathContentContains('//li/a[contains(@href, "bib-numerique/view-album/id/567")][@data-ajax="false"]', 'Histoires');
}
}
--
GitLab