Merge branch...

Merge branch 'hotline#115309_magasin_de_themes_liste_des_avis_sur_la_page_d_accueil_renvoi_direct_vers_les_avis_et_non_vers_la_notice_du_document' into 'hotline'

hotline#115309 : bootstrap : on homepage, reviews, link on thumbnail leads to…

See merge request !3616

VERSIONS_HOTLINE/115309

+ - ticket #115309 : Magasin de themes: Liste des avis sur la page d'accueil Le lien sur l'image de la notice renvoie directement vers l'avis.
\ No newline at end of file

library/Class/AvisNotice.php

@@ -223,8 +223,7 @@ class AvisNoticeLoader extends Storm_Model_Loader {
         $reviews_by_records [$record->getId()] = ['Record' => $record,
                                                   'Reviews' => []];
 
-      $reviews_by_records [$record->getId()]['Reviews'] = array_merge($reviews_by_records [$record->getId()]['Reviews'],
-                                                                      [$review]);
+      $reviews_by_records [$record->getId()]['Reviews'][] = $review;
     }
 
     $grouped = [];

library/templates/Intonation/Library/View/Wrapper/ReviewsByRecord.php

@@ -61,7 +61,15 @@ class Intonation_Library_View_Wrapper_ReviewsByRecord extends Intonation_Library
 
 
   public function getMainLink() {
-    return $this->_record->getMainLink();
+    $nav_url = (new Intonation_Library_View_Wrapper_Record_RichContent_Reviews)->getNavUrl();
+    $nav_url ['id'] = $this->_record->getModel()->getId();
+    return new Intonation_Library_Link(['Url' => $nav_url,
+                                        'Image' => Class_Template::current()->getIco($this->_view,
+                                                                                     'read-review',
+                                                                                     'library'),
+                                        'Text' => $this->_('Lire les avis'),
+                                        'Title' => $this->_('Lire les avis sur %s',
+                                                            $this->getMainTitle())]);
   }
 
 

tests/scenarios/Templates/TemplatesReviewsTest.php

@@ -22,7 +22,7 @@
 require_once('TemplatesTest.php');
 
 
-class TemplatesAddReviewTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsAddTest extends TemplatesIntonationTestCase {
 
   protected $_review;
 
@@ -68,7 +68,7 @@ class TemplatesAddReviewTest extends TemplatesIntonationTestCase {
 }
 
 
-class TemplatesAddReviewAjaxTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsAddAjaxTest extends TemplatesIntonationTestCase {
 
   protected $_review;
 
@@ -125,7 +125,7 @@ class TemplatesReviewsWidgetTest extends TemplatesIntonationTestCase {
 
 
   /** @test */
-  public function dispatchFrontShouldContainsLeRoi() {
+  public function dispatchFrontShouldContainsLeRoiWithLinkOnReview() {
     $widget = ((new Class_Systeme_Widget_Widget)
                ->setId(19)
                ->setProfileId(72)
@@ -137,7 +137,7 @@ class TemplatesReviewsWidgetTest extends TemplatesIntonationTestCase {
                      'link_to_all' => 1,
                      'embeded_code'=> 1,
                      'IntonationShowFooter' => 1,
-                     'rendering' => 'card',
+                     'rendering' => 'card-overlay',
                      'layout' => 'multiple_carousel'])
       ->updateProfile();
 
@@ -155,14 +155,15 @@ class TemplatesReviewsWidgetTest extends TemplatesIntonationTestCase {
                     'clef_oeuvre' => 'PSYKO',
                    ]);
 
-    $this->dispatch('/opac/index/index/id_profil/72', true);
-    $this->assertXPathContentContains('//div[@id = "boite_19"]', 'Le Roi');
+    $this->dispatch('/opac/index/index/id_profil/72');
+    $this->assertXPath('//div[@id="boite_19"]//a[contains(@href, "/record/reviews/id_profil/72/id/2")]');
   }
 }
 
 
 
-class TemplatesBlogReviewsActionTest extends TemplatesIntonationTestCase {
+
+class TemplatesReviewsBlogActionTest extends TemplatesIntonationTestCase {
   protected $_storm_default_to_volatile = true;
 
 
@@ -218,7 +219,7 @@ class TemplatesBlogReviewsActionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesBlogReadMoreActionTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsBlogReadMoreActionTest extends TemplatesIntonationTestCase {
   protected $_storm_default_to_volatile = true;
 
 
@@ -252,7 +253,7 @@ class TemplatesBlogReadMoreActionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesRecordReviewsActionTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsActionTest extends TemplatesIntonationTestCase {
   protected $_storm_default_to_volatile = true;
 
 
@@ -296,7 +297,7 @@ class TemplatesRecordReviewsActionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesRecordEditReviewsActionTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsEditActionTest extends TemplatesIntonationTestCase {
   protected $_storm_default_to_volatile = true;
 
 
@@ -331,7 +332,7 @@ class TemplatesRecordEditReviewsActionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesRecordDeleteReviewsActionTest extends TemplatesIntonationTestCase {
+class TemplatesReviewsDeleteReviewsActionTest extends TemplatesIntonationTestCase {
   protected $_storm_default_to_volatile = true;