Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Prevent activating email without body

Browse Source 
[MAILPOET-2366]
This commit is contained in:
Pavel Dohnal
2019-09-19 15:34:37 +02:00
committed by Jack Kitterhing
parent e56a654b2b
commit 35c9973c85
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletters/listings/notification.jsx
View File

@@ -189,7 +189,7 @@ class NewsletterListNotification extends React.Component {
// force refresh of listing so that groups are updated // force refresh of listing so that groups are updated
this.forceUpdate(); this.forceUpdate();
}).fail((response) => { }).fail((response) => {
MailPoet.Notice.error(MailPoet.I18n.t('postNotificationActivationFailed')); MailPoet.Notice.showApiErrorNotice(response);
// reset value to actual newsletter's status // reset value to actual newsletter's status
e.target.value = response.status; e.target.value = response.status;

2
assets/js/src/newsletters/listings/welcome.jsx
View File

@@ -184,7 +184,7 @@ class NewsletterListWelcome extends React.Component {
// force refresh of listing so that groups are updated // force refresh of listing so that groups are updated
this.forceUpdate(); this.forceUpdate();
}).fail((response) => { }).fail((response) => {
MailPoet.Notice.error(MailPoet.I18n.t('welcomeEmailActivationFailed')); MailPoet.Notice.showApiErrorNotice(response);
// reset value to actual newsletter's status // reset value to actual newsletter's status
e.target.value = response.status; e.target.value = response.status;

11
lib/Models/Newsletter.php
View File

@@ -344,6 +344,17 @@ class Newsletter extends Model {
} }
function setStatus($status = null) { function setStatus($status = null) {
if ($status === self::STATUS_ACTIVE) {
if (!$this->body || empty(json_decode($this->body))) {
$this->setError(
Helpers::replaceLinkTags(
__('This is an empty email without any content and it cannot be sent. Please update [link]the email[/link].'),
'admin.php?page=mailpoet-newsletter-editor&id=' . $this->id
)
);
return $this;
}
}
if (in_array($status, [ if (in_array($status, [
self::STATUS_DRAFT, self::STATUS_DRAFT,
self::STATUS_SCHEDULED, self::STATUS_SCHEDULED,

12
tests/integration/Models/NewsletterTest.php
View File

@@ -899,6 +899,7 @@ class NewsletterTest extends \MailPoetTest {
foreach ($newsletters_with_activation as $type) { foreach ($newsletters_with_activation as $type) {
$newsletter = Newsletter::createOrUpdate([ $newsletter = Newsletter::createOrUpdate([
'type' => $type, 'type' => $type,
'body' => '["x", "y"]',
]); ]);
$task = ScheduledTask::createOrUpdate([ $task = ScheduledTask::createOrUpdate([
'status' => ScheduledTask::STATUS_PAUSED, 'status' => ScheduledTask::STATUS_PAUSED,
@@ -914,6 +915,17 @@ class NewsletterTest extends \MailPoetTest {
} }
} }
function testBlocksActivationOfEmptyNewsletter() {
$newsletter = Newsletter::createOrUpdate([
'type' => Newsletter::TYPE_NOTIFICATION,
'body' => '[]',
'status' => Newsletter::STATUS_DRAFT,
]);
$newsletter = $newsletter->setStatus(Newsletter::STATUS_ACTIVE);
expect($newsletter->status)->equals(Newsletter::STATUS_DRAFT);
expect($newsletter->getErrors())->notEmpty();
}
function _after() { function _after() {
\ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table);
\ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);