From e23cd9caf810f837581a82aac9a91a426a07dfd6 Mon Sep 17 00:00:00 2001
From: efalcy <stl@gresille.org>
Date: Fri, 21 Mar 2014 16:55:35 +0100
Subject: [PATCH] When browsing domains, root domain links to homepage
---
library/ZendAfi/View/Helper/RenderDomainBrowser.php | 11 +++++++----
.../opac/controllers/DomainsControllerTest.php | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/library/ZendAfi/View/Helper/RenderDomainBrowser.php b/library/ZendAfi/View/Helper/RenderDomainBrowser.php
index 9285c933e02..add9e3326bf 100644
--- a/library/ZendAfi/View/Helper/RenderDomainBrowser.php
+++ b/library/ZendAfi/View/Helper/RenderDomainBrowser.php
@@ -84,17 +84,20 @@ class ZendAfi_View_Helper_RenderDomainBrowser extends ZendAfi_View_Helper_BaseHe
protected function getBrowsingUrl($domain) {
+ xdebug_break();
+ if ($domain->getId()==$this->_pref['root_domain_id'])
+ return $this->view->url([], null, true);
$params = $domain->hasSousDomaines()
- ? array_filter(['controller' =>'domains',
+ ? ['controller' =>'domains',
'action' => 'browse',
'id'=> $domain->getId(),
'id_module' => $this->_id_module
- ])
- : array_filter(['controller' =>'recherche',
+ ]
+ : ['controller' =>'recherche',
'action' => 'simple',
'id_catalogue'=> $domain->getId(),
'id_module' => $this->_id_module
- ]);
+ ];
return $this->view->url($params, null, true);
}
diff --git a/tests/application/modules/opac/controllers/DomainsControllerTest.php b/tests/application/modules/opac/controllers/DomainsControllerTest.php
index 5558f8d71ea..c36a389c11a 100644
--- a/tests/application/modules/opac/controllers/DomainsControllerTest.php
+++ b/tests/application/modules/opac/controllers/DomainsControllerTest.php
@@ -99,9 +99,9 @@ class DomainsControllerBrowseALetterDomainTest extends DomainsControllerBrowseTe
/** @test */
- public function shouldDisplayLinkToYouthDomain() {
+ public function youthDomainshouldLinkToHomepage() {
$this->assertXPath('//div[@class="breadcrumb_domains"]/ul/li/'
- . 'a[@href="/domains/browse/id/3/id_module/9"]/img[@src="http://imgs/youth.png"]'
+ . 'a[@href="/"]/img[@src="http://imgs/youth.png"]'
. '[following-sibling::span]',$this->_response->getBody());
}
}
--
GitLab