Merge branch 'change_ardans_help_link' into 'master'

Change ardans help link

See merge request !1382

VERSIONS_WIP/35567

+ - ticket #35567 : Reste 5 liens d'aide qui pointe vers Ardans !
\ No newline at end of file

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

@@ -27,11 +27,8 @@ class ZendAfi_View_Helper_Admin_HelpLink extends ZendAfi_View_Helper_BaseHelper
     if ($action === null)
       $action = strtolower($request->getActionName());
 
-    $providers = $this->getProviders();
-    $url = $this->urlExactlyFor($controller, $action, $providers);
-
-    if ('' == $url)
-      $url = $this->urlApproximativelyFor($controller, $action, $providers);
+    $url = (new ZendAfi_View_Helper_Admin_HelpLinkBokehWiki())
+      ->urlFor($controller, $action);
 
     if ('' == $url)
       return '';
@@ -43,76 +40,12 @@ class ZendAfi_View_Helper_Admin_HelpLink extends ZendAfi_View_Helper_BaseHelper
                               'alt' => $this->view->_('Aide')]),
             ['class' => 'ardans_help', 'href' => $url, 'target' => '_blank']);
   }
-
-
-  protected function urlExactlyFor($controller, $action, $providers) {
-    foreach($providers as $provider)
-      if ('' != ($url = $provider->urlFor($controller, $action)))
-        return $url;
-    return '';
-  }
-
-
-  protected function urlApproximativelyFor($controller, $action, $providers) {
-    foreach($providers as $provider)
-      if ('' != ($url = $provider->urlFor($controller, $action, true)))
-        return $url;
-    return '';
-  }
-
-
-  protected function getProviders() {
-    return [new ZendAfi_View_Helper_Admin_HelpLinkArdans(),
-            new ZendAfi_View_Helper_Admin_HelpLinkBokehWiki()];
-  }
 }
 
 
 
-abstract class ZendAfi_View_Helper_Admin_HelpLinkAbstract {
-  protected $_mapping = [];
-  protected $_pattern = '';
-
-  public function urlFor($controller, $action, $fall_back_to_index=false) {
-    if (!array_key_exists($controller, $this->_mapping))
-      return '';
-
-    $controller_mapping = $this->_mapping[$controller];
-
-    if ($fall_back_to_index
-        && !array_key_exists($action, $controller_mapping))
-      $action = 'index';
-
-    if (!array_key_exists($action, $controller_mapping))
-      return '';
-
-    return sprintf($this->_pattern, $controller_mapping[$action]);
-  }
-}
-
-
 
-class ZendAfi_View_Helper_Admin_HelpLinkArdans
-  extends ZendAfi_View_Helper_Admin_HelpLinkAbstract {
-
-  protected $_pattern = 'https://akm.ardans.fr/AFI2/invite/listerFiche.do?idFiche=%s';
-
-  protected $_mapping =
-    ['profil' => ['proprietes' => 3894],
-
-     'opds' => [ 'index' => 4767 ],
-
-     'index' => ['index' => 4037,
-                 'changelog' => 4488],
-
-     'bib' => ['index' => 3928]];
-
-}
-
-
-
-class ZendAfi_View_Helper_Admin_HelpLinkBokehWiki
-  extends ZendAfi_View_Helper_Admin_HelpLinkAbstract {
+class ZendAfi_View_Helper_Admin_HelpLinkBokehWiki {
 
   protected $_pattern = 'http://wiki.bokeh-library-portal.org/index.php/%s';
   protected $_mapping =
@@ -140,9 +73,29 @@ class ZendAfi_View_Helper_Admin_HelpLinkBokehWiki
      'profil'                 => ['index' => 'Configurer_un_profil',
                                   'edit' => 'Configurer_un_profil',
                                   'accueil' => 'Configurer_une_page',
-                                  'menusindex' => 'Configurer_un_menu'],
-     'redmine'                => ['index' => 'Visualisation_des_tickets_Redmine']
+                                  'menusindex' => 'Configurer_un_menu',
+                                  'proprietes' => 'Réglage_de_l\'affichage_des_exemplaires'],
+     'redmine'                => ['index' => 'Visualisation_des_tickets_Redmine'],
+     'opds'                   => ['index' => 'Importer_des_livres_numériques'],
+     'bib'                    => ['index' => 'Modifier_une_bibliothèque'],
+     'index'                  => ['index' => 'Bokeh']
   ];
+
+
+  public function urlFor($controller, $action) {
+    if (!array_key_exists($controller, $this->_mapping))
+      return '';
+
+    $controller_mapping = $this->_mapping[$controller];
+
+    if (!array_key_exists($action, $controller_mapping))
+      $action = 'index';
+
+    if (!array_key_exists($action, $controller_mapping))
+      return '';
+
+    return sprintf($this->_pattern, $controller_mapping[$action]);
+  }
 }
 
 ?>

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

@@ -61,7 +61,7 @@ class AdminIndexControllerIndexActionTest extends AdminIndexControllerTestCase {
 
   /** @test */
   public function helpLinkShouldBePresent() {
-    $this->assertXPath("//a[@href='https://akm.ardans.fr/AFI2/invite/listerFiche.do?idFiche=4037']//img");
+    $this->assertXPath("//a[@href='http://wiki.bokeh-library-portal.org/index.php/Bokeh']//img", $this->_response->getBody());
   }
 
 

tests/library/ZendAfi/View/Helper/Admin/AdminHelpLinkTest.php

@@ -37,14 +37,6 @@ class AdminHelpLinkHelperTest extends ViewHelperTestCase {
   }
 
 
-  protected function assertHelpLink($help_id, $action=null) {
-    $html = $this->helper->helpLink($action);
-    $this->assertXPath($html,
-                       "//a[@href='https://akm.ardans.fr/AFI2/invite/listerFiche.do?idFiche=$help_id']",
-                       $html);
-  }
-
-
   protected function assertWikiLink($page, $action=null) {
     $html = $this->helper->helpLink($action);
     $path = sprintf('//a[@href="http://wiki.bokeh-library-portal.org/index.php/%s"]',
@@ -95,13 +87,6 @@ class AdminHelpLinkHelperTest extends ViewHelperTestCase {
   }
 
 
-  /** @test */
-  public function helpForProfilProprietesShouldReturnFiche3894() {
-    $this->setControllerAction('profil', 'proprietes');
-    $this->assertHelpLink(3894);
-  }
-
-
   /** @test */
   public function helpForCatalogueShouldBeWiki() {
     $this->setControllerAction('catalogue');
@@ -123,13 +108,6 @@ class AdminHelpLinkHelperTest extends ViewHelperTestCase {
   }
 
 
-  /** @test */
-  public function helpForIndexSouldReturnFiche4037() {
-    $this->setControllerAction('index');
-    $this->assertHelpLink(4037);
-  }
-
-
   /** @test */
   public function helpForModuleRechercheViewNoticeShouldBeWiki() {
     $this->setControllerAction('modules', 'recherche');