diff --git a/VERSIONS_HOTLINE/76992 b/VERSIONS_HOTLINE/76992 new file mode 100644 index 0000000000000000000000000000000000000000..ee018a18050a71b09af0fed20950e01bce8eb43c --- /dev/null +++ b/VERSIONS_HOTLINE/76992 @@ -0,0 +1,2 @@ + - ticket #76992 : Article : amélioration du message de refus dans le workflow. + \ No newline at end of file diff --git a/library/Class/Article.php b/library/Class/Article.php index b519e1f057bca6c1887a161ae5a983f85764acd7..d6e82d74380a5027ce794656eeff26fb38e4f307 100644 --- a/library/Class/Article.php +++ b/library/Class/Article.php @@ -719,9 +719,9 @@ class Class_Article extends Storm_Model_Abstract { public function getRefusMessage() { - if (!parent::_get('refus_message')) - return Class_AdminVar::getWorkflowTextMailArticleRefused(); - return parent::_get('refus_message'); + return implode("\n", + array_filter([Class_AdminVar::getWorkflowTextMailArticleRefused(), + parent::_get('refus_message')])); } diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php index 85c8d47a4ad38e37dd0489830c2ab791ac5d4d12..9e4666a86bae2d5ff13cd21e25ab699680442f72 100644 --- a/tests/application/modules/admin/controllers/CmsControllerTest.php +++ b/tests/application/modules/admin/controllers/CmsControllerTest.php @@ -1929,7 +1929,8 @@ class CmsControllerWorkflowArticleRefusedTest extends CmsControllerWorkflowTestC 'description' => '', 'id_cat' => 23, 'contenu' => 'Ne manquez pas cet évènement.', - 'status' => Class_Article::STATUS_REFUSED + 'status' => Class_Article::STATUS_REFUSED, + 'refus_message' => 'Votre article laisse à désirer, à revoir de fond en comble immédiatement.' ]; $this->postDispatch('/admin/cms/edit/id/4', @@ -1979,11 +1980,19 @@ class CmsControllerWorkflowArticleRefusedTest extends CmsControllerWorkflowTestC /** @test */ public function sentMailToUserWhenRefusedShouldContainsDefaultBody() { + Class_AdminVar::set('WORKFLOW_TEXT_MAIL_ARTICLE_REFUSED', 'L\'article "TITRE_ARTICLE" "URL_ARTICLE" a été refusé par "SAVED_BY_ARTICLE".'); $this->postArticleRefuser(); - $this->assertEquals('L\'article a été refusé.',quoted_printable_decode($this->mock_transport->getSentMails()[0]->getBodyText()->getContent())); + $body_mail = quoted_printable_decode($this + ->mock_transport + ->getSentMails()[0] + ->getBodyText() + ->getContent()); + $this->assertContains('L\'article "Katsuhiro Otomo en dédicace !', $body_mail); + $this->assertContains('/cms/articleview/id/4', $body_mail); + $this->assertContains('a été refusé par "Mario Super". +Votre article laisse à désirer, à revoir de fond en comble immédiatement.', + $body_mail); } - - }