hotline#136543 : Notice : Moove rebound link to notice header

VERSIONS_HOTLINE/136543

+ - ticket #136543 : Notice de périodique : le lien de rebond vers la notice de titre déplacé du bloc de détail vers l'entête de la notice
\ No newline at end of file

library/ZendAfi/View/Helper/Notice/ArticlesPeriodiques.php

@@ -25,7 +25,7 @@ class ZendAfi_View_Helper_Notice_ArticlesPeriodiques extends ZendAfi_View_Helper
     if ($periodiques = $notice->getArticlesPeriodique())
       return (new Class_NoticeHtml())->getArticlesPeriodique($periodiques);
 
-    return $this->_renderLinkToParent($notice) . $this->_renderArticles($notice);
+    return $this->_renderArticles($notice);
   }
 
 
@@ -39,13 +39,4 @@ class ZendAfi_View_Helper_Notice_ArticlesPeriodiques extends ZendAfi_View_Helper
 
     return '';
   }
-
-
-  protected function _renderLinkToParent($record) {
-    return ($parent = $record->getSerialTitleParentRecord())
-      ? $this->_tag('a',
-                    $this->_('Voir la revue %s', $parent->getRecordTitle()),
-                    ['href' => $this->view->urlNotice($parent)])
-      : '';
-  }
 }

library/ZendAfi/View/Helper/Notice/Entete.php

@@ -40,13 +40,13 @@ class ZendAfi_View_Helper_Notice_Entete extends ZendAfi_View_Helper_BaseHelper {
         || ($preferences[static::SETTING_ADD_SERIE_LINK] !== false))
         $html = $this->view->Notice_SeriesLink($notice);
 
+    $html .= $this->_addReboundParentLink($notice);
+
     return
         $html . $this->libellesValeursToHtml($libelles_valeurs);
   }
 
 
-
-
   public function firstAndSecond($entetes){
     $class =[];
     foreach($entetes as $champ){
@@ -93,4 +93,13 @@ class ZendAfi_View_Helper_Notice_Entete extends ZendAfi_View_Helper_BaseHelper {
 
     return $this->view->notice_EnteteElement($item['label'], $item['champ'], $class);
   }
+
+
+  protected function _addReboundParentLink($record) {
+    return ($parent = $record->getSerialTitleParentRecord())
+      ? $this->_tag('a',
+                    $this->_('Voir la revue %s', $parent->getRecordTitle()),
+                    ['href' => $this->view->urlNotice($parent)])
+      : '';
+  }
 }

tests/application/modules/opac/controllers/NoticeAjaxControllerPMBTest.php

@@ -266,24 +266,24 @@ class NoticeAjaxControllerPMBSerialArticleTest extends NoticeAjaxControllerPMBSe
   /** @test */
   public function usingTypeDocPeriodiqueTitleRecordShouldContainsLinkForSerieWithTypeDocTwo() {
     $this->fixture('Class_Notice',
-                             ['id' => '233',
-                              'clef_chapeau' => 'REVUE FRANC',
-                              'type_doc' => Class_TypeDoc::PERIODIQUE_TITLE,
-                              'titre_principal' => 'Matricule des anges',
-                              'exemplaires' => [
-                                  $this->fixture('Class_Exemplaire',
-                                                 ['id' => 4,
-                                                  'id_origine' => '1787',
-                                                  'id_int_bib' => 3,
-                                                  'code_barres' => '1-234',
-                                                  'type' => Class_Notice::TYPE_BIBLIOGRAPHIC,
-                                                  'zone995' => serialize([ ['code' => '0',
-                                                                            'valeur' => '35-bull'] ])])
-                              ]
-                             ]);
+                   ['id' => '233',
+                    'clef_chapeau' => 'REVUE FRANC',
+                    'type_doc' => Class_TypeDoc::PERIODIQUE_TITLE,
+                    'titre_principal' => 'Matricule des anges',
+                    'exemplaires' => [
+                                      $this->fixture('Class_Exemplaire',
+                                                     ['id' => 4,
+                                                      'id_origine' => '1787',
+                                                      'id_int_bib' => 3,
+                                                      'code_barres' => '1-234',
+                                                      'type' => Class_Notice::TYPE_BIBLIOGRAPHIC,
+                                                      'zone995' => serialize([ ['code' => '0',
+                                                                                'valeur' => '35-bull'] ])])
+                    ]
+                   ]);
     $this->dispatch('/opac/recherche/viewnotice/id/233', true);
 
-    $this->assertXPathContentContains('//a[contains(@href,"/serie/MATRICULE+DES+ANGES-2/")]',
+    $this->assertXPathContentContains('//a[contains(@href, "/serie/MATRICULE+DES+ANGES-2/")]',
                                       'Voir tous les numéros de Matricule des anges');
   }
 }
@@ -291,6 +291,30 @@ class NoticeAjaxControllerPMBSerialArticleTest extends NoticeAjaxControllerPMBSe
 
 
 
+/* Hotline:#136543 */
+class NoticeAjaxControllerPMBSerialArticleWithReboundInHeaderTest
+  extends NoticeAjaxControllerPMBSerialArticleTestCase {
+
+  public function setUp() {
+    parent::setUp();
+
+    Class_Notice::find(123)
+      ->setIssn('12345')
+      ->assertSave();
+    $this->dispatch('/opac/recherche/viewnotice/id/123');
+  }
+
+
+  /** @test */
+  public function pageShouldContainsLinkToVoirLaRevue() {
+    $this->assertXPathContentContains('//a[contains(@href, "/viewnotice/id/12")]',
+                                      'Voir la revue Revue française de pédagogie');
+  }
+}
+
+
+
+
 class NoticeAjaxControllerPMBSerialDetailsActionTest extends NoticeAjaxControllerPMBSerialArticleTestCase {
   public function setUp() {
     parent::setUp();
@@ -329,9 +353,10 @@ class NoticeAjaxControllerPMBSerialDetailsActionTest extends NoticeAjaxControlle
 
 
   /** @test */
-  public function detailsContentForSerialShouldContainsLinkToParentRecord12() {
-    $this->assertXPathContentContains('//a[contains(@href,"/viewnotice/id/12")]',
-                                      utf8_encode('Voir la revue Revue française de pédagogie'));
+  public function detailsContentForSerialShouldotContainsLinkToParentRecord12() {
+    /* Hotline:#136543 */
+    $this->assertNotXPathContentContains('//a[contains(@href, "/viewnotice/id/12")]',
+                                         utf8_encode('Voir la revue Revue française de pédagogie'));
   }
 }