Merge branch 'hotline#108325_pb_de_titre_et_redacteur' into 'hotline'

hotline #108325 : hide title also hide author

See merge request !3595

VERSIONS_HOTLINE/108325

+ - ticket #108325 : Magasin de thèmes : Le paramètre "Titre caché" des articles cache aussi l'auteur

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

@@ -23,15 +23,19 @@
 class Intonation_Library_View_Wrapper_Article extends Intonation_Library_View_Wrapper_Abstract {
 
   public function getMainTitle() {
-    return
-      $this->_model->getCacherTitre()
-      ? ''
-      : $this->_model->getTitre();
+    return $this->_whenTitleIsNotHidden($this->_model->getTitre());
   }
 
 
   public function getSecondaryTitle() {
-    return $this->_model->getAuthorName();
+    return $this->_whenTitleIsNotHidden($this->_model->getAuthorName());
+  }
+
+
+  protected function _whenTitleIsNotHidden($value) {
+    return $this->_model->getCacherTitre()
+      ? ''
+      : $value;
   }
 
 

library/templates/Intonation/View/RenderArticle.php

@@ -31,12 +31,11 @@ class Intonation_View_RenderArticle extends ZendAfi_View_Helper_BaseHelper {
                      ? ''
                      : $this->_tag('h2',
                                    $article->getTitre(),
-                                   ['class' => 'card-title']),
-
-                     $this->_tag('p',
-                                 $article->getAuthorName(),
-                                 ['title' => $this->_('Auteur de l\'article "%s".', $article->getAuthorName()),
-                                  'class' => 'card-subtitle text-muted']),
+                                   ['class' => 'card-title'])
+                     . $this->_tag('p',
+                                   $article->getAuthorName(),
+                                   ['title' => $this->_('Auteur de l\'article "%s".', $article->getAuthorName()),
+                                    'class' => 'card-subtitle text-muted']),
 
                      $this->_badges($wrapper),
 

tests/scenarios/Templates/TemplatesArticlesTest.php

@@ -76,7 +76,7 @@ class TemplatesArticlesWidgetTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesCmsListActionTest extends TemplatesIntonationTestCase {
+class TemplatesArticlesCmsListActionTest extends TemplatesIntonationTestCase {
   /** @test */
   public function dispatchShouldRenderSprechenSieDeutsh() {
     $this->fixture('Class_Article',
@@ -97,7 +97,7 @@ class TemplatesCmsListActionTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesCmsArticleViewTest extends TemplatesIntonationTestCase {
+class TemplatesArticlesCmsArticleViewTest extends TemplatesIntonationTestCase {
   public function setUp() {
     parent::setUp();
     $this->fixture('Class_Article',
@@ -139,7 +139,7 @@ class TemplatesCmsArticleViewTest extends TemplatesIntonationTestCase {
 
 
 
-class TemplatesCmsArticleViewWithHiddenTitleTest extends TemplatesIntonationTestCase {
+class TemplatesArticlesCmsArticleViewWithHiddenTitleTest extends TemplatesIntonationTestCase {
   public function setUp() {
     parent::setUp();
     $this->fixture('Class_Article',
@@ -149,7 +149,11 @@ class TemplatesCmsArticleViewWithHiddenTitleTest extends TemplatesIntonationTest
                     'contenu' => '<p>Une b...</p>',
                     'events_debut' => '2020-03-13 00:00:00',
                     'events_fin' => '2020-07-31 00:00:00',
-                    'all_day' => 1]);
+                    'all_day' => 1,
+                    'auteur' => $this->fixture('Class_Users',
+                                               ['id' => 88393,
+                                                'login' => 'Harlock',
+                                                'password' => 'Arc4di4 for 3v3r'])]);
 
     $this->dispatch('/opac/cms/articleview/id/7/id_profil/72');
   }
@@ -159,12 +163,18 @@ class TemplatesCmsArticleViewWithHiddenTitleTest extends TemplatesIntonationTest
   public function titleH2ParlerVousFrançaisShouldNotBePresent() {
     $this->assertNotXPath('//main//div//h2[@class="card-title"]');
   }
+
+
+  /** @test */
+  public function authorShouldNotBePresent() {
+    $this->assertNotXPathContentContains('//div', 'Harlock');
+  }
 }
 
 
 
 
-class TemplatesCmsArticleViewWithLocationTest extends TemplatesIntonationTestCase {
+class TemplatesArticlesCmsArticleViewWithLocationTest extends TemplatesIntonationTestCase {
   public function setUp() {
     parent::setUp();
     $annecy = $this->fixture('Class_Lieu',