Fixing more bugs. Lists and scheduling options are hidden when editing a newsletter that is being sent
This commit is contained in:
@@ -250,6 +250,12 @@ define(
|
|||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
render: function () {
|
render: function () {
|
||||||
|
const isPaused = this.state.item.status == 'sending'
|
||||||
|
&& this.state.item.queue
|
||||||
|
&& this.state.item.queue.status == 'paused';
|
||||||
|
const fields = (!isPaused)
|
||||||
|
? this.state.fields
|
||||||
|
: this.state.fields.filter(field => field.name != 'segments' && field.name != 'options');
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<h1>{MailPoet.I18n.t('finalNewsletterStep')}</h1>
|
<h1>{MailPoet.I18n.t('finalNewsletterStep')}</h1>
|
||||||
@@ -258,32 +264,30 @@ define(
|
|||||||
|
|
||||||
<Form
|
<Form
|
||||||
id="mailpoet_newsletter"
|
id="mailpoet_newsletter"
|
||||||
fields={ this.state.fields }
|
fields={ fields }
|
||||||
item={ this.state.item }
|
item={ this.state.item }
|
||||||
loading={ this.state.loading }
|
loading={ this.state.loading }
|
||||||
onChange={this.handleFormChange}
|
onChange={this.handleFormChange}
|
||||||
onSubmit={this.handleSave}
|
onSubmit={this.handleSave}
|
||||||
>
|
>
|
||||||
<p className="submit">
|
<p className="submit">
|
||||||
<input
|
{
|
||||||
|
isPaused ?
|
||||||
|
<input
|
||||||
|
className="button button-primary"
|
||||||
|
type="button"
|
||||||
|
onClick={ this.handleResume }
|
||||||
|
value={MailPoet.I18n.t('resume')} />
|
||||||
|
:
|
||||||
|
<input
|
||||||
className="button button-primary"
|
className="button button-primary"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={ this.handleSend }
|
onClick={ this.handleSend }
|
||||||
value={MailPoet.I18n.t('send')}
|
value={MailPoet.I18n.t('send')}
|
||||||
{...this.getSendButtonOptions()}
|
{...this.getSendButtonOptions()}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{
|
|
||||||
this.state.item.status == 'sending'
|
|
||||||
&& this.state.item.queue
|
|
||||||
&& this.state.item.queue.status == 'paused'
|
|
||||||
? <input
|
|
||||||
className="button button-secondary"
|
|
||||||
type="button"
|
|
||||||
onClick={ this.handleResume }
|
|
||||||
value={MailPoet.I18n.t('resume')} />
|
|
||||||
: null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
<input
|
<input
|
||||||
className="button button-secondary"
|
className="button button-secondary"
|
||||||
type="submit"
|
type="submit"
|
||||||
|
@@ -34,7 +34,7 @@ class LinksTest extends \MailPoetTest {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function testItDoesnotRehashExistingLinks() {
|
function testItDoesNotRehashExistingLinks() {
|
||||||
$link = NewsletterLink::create();
|
$link = NewsletterLink::create();
|
||||||
$link->newsletter_id = 3;
|
$link->newsletter_id = 3;
|
||||||
$link->queue_id = 3;
|
$link->queue_id = 3;
|
||||||
|
@@ -341,7 +341,7 @@
|
|||||||
'unsavedChangesWillBeLost': __('There are unsaved changes which will be lost if you leave this page.'),
|
'unsavedChangesWillBeLost': __('There are unsaved changes which will be lost if you leave this page.'),
|
||||||
'selectColor': _x('Select', 'select color'),
|
'selectColor': _x('Select', 'select color'),
|
||||||
'cancelColorSelection': _x('Cancel', 'cancel color selection'),
|
'cancelColorSelection': _x('Cancel', 'cancel color selection'),
|
||||||
'newsletterIsPaused': __('Email sending has been paused'),
|
'newsletterIsPaused': __('Email sending has been paused.'),
|
||||||
}) %>
|
}) %>
|
||||||
<% endblock %>
|
<% endblock %>
|
||||||
|
|
||||||
@@ -1226,7 +1226,14 @@
|
|||||||
}
|
}
|
||||||
}).done(response =>
|
}).done(response =>
|
||||||
MailPoet.Notice.success(MailPoet.I18n.t('newsletterIsPaused'))
|
MailPoet.Notice.success(MailPoet.I18n.t('newsletterIsPaused'))
|
||||||
);
|
).fail(function(response) {
|
||||||
|
if (response.errors.length > 0) {
|
||||||
|
MailPoet.Notice.error(
|
||||||
|
response.errors.map(function(error) { return error.message; }),
|
||||||
|
{ scroll: true, static: true }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}).fail(function(response) {
|
}).fail(function(response) {
|
||||||
if (response.errors.length > 0) {
|
if (response.errors.length > 0) {
|
||||||
|
Reference in New Issue
Block a user