From 81aa6e2a7f32e4ed32b3e62fdad635b1e3786839 Mon Sep 17 00:00:00 2001
From: Henri-Damien LAURENT <hdlaurent@afi-sa.net>
Date: Mon, 25 Sep 2023 07:30:32 +0000
Subject: [PATCH] dev#160166 : Widget always send results Should be empty when
no data selected
---
library/Class/Article/MailRenderer.php | 2 ++
library/Class/Notice/MailRenderer.php | 2 +-
.../modules/admin/controllers/NewsletterControllerTest.php | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/library/Class/Article/MailRenderer.php b/library/Class/Article/MailRenderer.php
index d03963c5040..d31c1a14803 100644
--- a/library/Class/Article/MailRenderer.php
+++ b/library/Class/Article/MailRenderer.php
@@ -46,6 +46,8 @@ class Class_Article_MailRenderer {
public function renderWithWidget(Class_Newsletter $newsletter) :string {
+ if (($newsletter->getArticlesIds() == 0) && ($newsletter->getArticlesCategoriesIds() ==0))
+ return '';
$view = (new ZendAfi_Controller_Action_Helper_View)->init();
$widget = (new Class_Systeme_Widget_Widget)
diff --git a/library/Class/Notice/MailRenderer.php b/library/Class/Notice/MailRenderer.php
index fb0ea78ed09..6b6315d1390 100644
--- a/library/Class/Notice/MailRenderer.php
+++ b/library/Class/Notice/MailRenderer.php
@@ -51,7 +51,7 @@ class Class_Notice_MailRenderer {
public function renderWithWidget(Class_Newsletter $newsletter) :string {
- if (! ((bool)$newsletter->getIdCatalogue() && (bool)$newsletter->getIdPanier()))
+ if (($newsletter->getIdCatalogue() == 0) && ($newsletter->getIdPanier() ==0))
return '';
$view = (new ZendAfi_Controller_Action_Helper_View)->init();
diff --git a/tests/application/modules/admin/controllers/NewsletterControllerTest.php b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
index 3de5b87ad51..aa2c6991cf6 100644
--- a/tests/application/modules/admin/controllers/NewsletterControllerTest.php
+++ b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
@@ -1074,7 +1074,7 @@ class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHolder
-class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersWithoutCatalogueTest
+class Admin_NewsletterControllerPreviewActionWithPlaceHoldersWithoutCatalogueTest
extends Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase {
protected function _customizeNewsletter(Class_Newsletter $newsletter) {
@@ -1097,7 +1097,7 @@ class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHolder
-class Admin_NewsletterControllerPreviewActionWithArticlesSelectionAndPlaceHoldersWithoutArticlesTes
+class Admin_NewsletterControllerPreviewActionWithPlaceholdersWithoutArticlesTest
extends Admin_NewsletterControllerPreviewActionPlaceHoldersTestCase {
protected function _customizeNewsletter(Class_Newsletter $newsletter) {
--
GitLab