Merge branch 'hotline#133092_retour_au_site_avec_url_personnalisee' into 'hotline'

hotline #133092 Administration : back to site link use current profil

See merge request !4168

VERSIONS_HOTLINE/133092

+ - ticket #133092 : Administration : le lien "retour au site" utilise l'URL personnalisée du profil courant
\ No newline at end of file

library/ZendAfi/View/Helper/Admin/Nav.php

@@ -50,7 +50,7 @@ class ZendAfi_View_Helper_Admin_Nav extends ZendAfi_View_Helper_BaseHelper {
               ['icon' => 'back_to_front',
                'label' => $this->_('Retour au site'),
                'title' => $this->_('Retourner sur la partie publique du portail'),
-               'url' => $this->view->url(['id_profil' => Class_Profil::getCurrentProfil()->getId()], null, true)],
+               'url' => Class_Profil::getCurrentProfil()->getUrl()],
 
               ['icon' => 'identity',
                'label' => $identity->getLogin() . ' (' . $identity->getLibelleRole() . ')',

tests/application/modules/admin/controllers/IndexControllerTest.php

@@ -126,6 +126,12 @@ class Admin_IndexControllerTest extends Admin_IndexControllerTestCase {
 
     Class_BokehVersion::setWebClient($mock_http);
 
+    $this->fixture(Class_Profil::class,
+                   ['id' => 4,
+                    'libelle' => 'ludotek',
+                    'rewrite_url' => 'ludotek'])
+         ->beCurrentProfil();
+
     $this->dispatch('/admin/index/index', true);
   }
 
@@ -173,6 +179,12 @@ class Admin_IndexControllerTest extends Admin_IndexControllerTestCase {
   }
 
 
+  /** @test */
+  public function menuBackToSiteLinkShouldBeSlashLudotek() {
+    $this->assertXPathContentContains('//div[@class="menu barre_nav"]//a[text()="Retour au site"]/@href', '/ludotek');
+  }
+
+
   /** @test */
   public function linkToGoogleGroupShouldBePresent() {
     $this->assertXPathContentContains('//a[contains(@href, "utilisateurs-bokeh")]', 'Google group Bokeh');