fix some bugs

This commit is contained in:
Amine Ben hammou
2017-08-10 15:34:37 +00:00
parent b2b1f7ff71
commit 033d527db9
3 changed files with 18 additions and 12 deletions

View File

@@ -97,6 +97,17 @@ const bulk_actions = [
}, },
]; ];
const confirmEdit = (newsletter) => {
if(
!newsletter.queue
|| newsletter.status != 'sending'
|| newsletter.queue.status !== null
|| window.confirm(MailPoet.I18n.t('confirmEdit'))
) {
window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`;
}
};
let newsletter_actions = [ let newsletter_actions = [
{ {
name: 'view', name: 'view',
@@ -111,15 +122,7 @@ let newsletter_actions = [
{ {
name: 'edit', name: 'edit',
label: MailPoet.I18n.t('edit'), label: MailPoet.I18n.t('edit'),
onClick: (newsletter) => { onClick: confirmEdit,
if(
!newsletter.queue
|| newsletter.queue.status != 'scheduled'
|| window.confirm(MailPoet.I18n.t('confirmEdit'))
) {
window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`;
}
},
}, },
{ {
name: 'duplicate', name: 'duplicate',
@@ -175,7 +178,8 @@ const NewsletterListStandard = React.createClass({
<strong> <strong>
<a <a
className="row-title" className="row-title"
href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` } href="javascript:;"
onClick={() => confirmEdit(newsletter)}
>{ newsletter.queue.newsletter_rendered_subject || newsletter.subject }</a> >{ newsletter.queue.newsletter_rendered_subject || newsletter.subject }</a>
</strong> </strong>
{ actions } { actions }

View File

@@ -274,7 +274,9 @@ define(
/> />
&nbsp; &nbsp;
{ {
this.state.item.queue && this.state.item.queue.status == 'paused' this.state.item.status == 'sending'
&& this.state.item.queue
&& this.state.item.queue.status == 'paused'
? <input ? <input
className="button button-secondary" className="button button-secondary"
type="button" type="button"

View File

@@ -1216,7 +1216,7 @@
config: config, config: config,
}); });
var queue = response.data.queue; var queue = response.data.queue;
if (queue && queue.status == 'scheduled') { if (response.data.status == 'sending' && queue && queue.status === null) {
MailPoet.Ajax.post({ MailPoet.Ajax.post({
api_version: window.mailpoet_api_version, api_version: window.mailpoet_api_version,
endpoint: 'sending_queue', endpoint: 'sending_queue',