removed parsley validation on step 3
- fixed placeholder for select2 instances in settings - fixed issue in sending queue worker when newsletter does not exist
This commit is contained in:
@ -120,7 +120,7 @@ function(
|
|||||||
<select
|
<select
|
||||||
id={ this.props.field.id || this.props.field.name }
|
id={ this.props.field.id || this.props.field.name }
|
||||||
ref="select"
|
ref="select"
|
||||||
placeholder={ this.props.field.placeholder }
|
data-placeholder={ this.props.field.placeholder }
|
||||||
multiple={ this.props.field.multiple }
|
multiple={ this.props.field.multiple }
|
||||||
defaultValue={ default_value }
|
defaultValue={ default_value }
|
||||||
{...this.props.field.validation}
|
{...this.props.field.validation}
|
||||||
|
@ -145,14 +145,6 @@ define(
|
|||||||
}.bind(this));
|
}.bind(this));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
componentDidMount: function() {
|
|
||||||
if(this.isMounted()) {
|
|
||||||
jQuery('#mailpoet_newsletter').parsley();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
isValid: function() {
|
|
||||||
return (jQuery('#mailpoet_newsletter').parsley().validate());
|
|
||||||
},
|
|
||||||
render: function() {
|
render: function() {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
@ -166,8 +158,7 @@ define(
|
|||||||
fields={ fields }
|
fields={ fields }
|
||||||
params={ this.props.params }
|
params={ this.props.params }
|
||||||
messages={ messages }
|
messages={ messages }
|
||||||
isValid={ this.isValid }>
|
>
|
||||||
|
|
||||||
<p className="submit">
|
<p className="submit">
|
||||||
<input
|
<input
|
||||||
className="button button-primary"
|
className="button button-primary"
|
||||||
|
@ -19,11 +19,15 @@ class SendingQueue {
|
|||||||
function process() {
|
function process() {
|
||||||
// TODO: implement mailer sending frequency limits
|
// TODO: implement mailer sending frequency limits
|
||||||
foreach($this->getQueues() as $queue) {
|
foreach($this->getQueues() as $queue) {
|
||||||
$newsletter = Newsletter::findOne($queue->newsletter_id)
|
$newsletter = Newsletter::findOne($queue->newsletter_id);
|
||||||
->asArray();
|
|
||||||
if(!$newsletter) {
|
if($newsletter === false) {
|
||||||
|
//TODO: delete queue item if newsletter doesn't exist
|
||||||
continue;
|
continue;
|
||||||
};
|
} else {
|
||||||
|
$newsletter = $newsletter->asArray();
|
||||||
|
}
|
||||||
|
|
||||||
$mailer = $this->configureMailerForNewsletter($newsletter);
|
$mailer = $this->configureMailerForNewsletter($newsletter);
|
||||||
$newsletter = $this->renderNewsletter($newsletter);
|
$newsletter = $this->renderNewsletter($newsletter);
|
||||||
$subscribers = json_decode($queue->subscribers, true);
|
$subscribers = json_decode($queue->subscribers, true);
|
||||||
|
@ -109,7 +109,7 @@
|
|||||||
<select
|
<select
|
||||||
id="mailpoet_subscribe_on_comment_segments"
|
id="mailpoet_subscribe_on_comment_segments"
|
||||||
name="subscribe[on_comment][segments][]"
|
name="subscribe[on_comment][segments][]"
|
||||||
placeholder="<%= __('Choose a list') %>"
|
data-placeholder="<%= __('Choose a list') %>"
|
||||||
multiple
|
multiple
|
||||||
>
|
>
|
||||||
<% for segment in segments %>
|
<% for segment in segments %>
|
||||||
@ -173,7 +173,7 @@
|
|||||||
<select
|
<select
|
||||||
id="mailpoet_subscribe_on_register_segments"
|
id="mailpoet_subscribe_on_register_segments"
|
||||||
name="subscribe[on_register][segments][]"
|
name="subscribe[on_register][segments][]"
|
||||||
placeholder="<%= __('Choose a list') %>"
|
data-placeholder="<%= __('Choose a list') %>"
|
||||||
multiple
|
multiple
|
||||||
>
|
>
|
||||||
<% for segment in segments %>
|
<% for segment in segments %>
|
||||||
@ -239,7 +239,7 @@
|
|||||||
<select
|
<select
|
||||||
id="mailpoet_subscription_edit_segments"
|
id="mailpoet_subscription_edit_segments"
|
||||||
name="subscription[segments][]"
|
name="subscription[segments][]"
|
||||||
placeholder="<%= __('Leave empty to show all lists') %>"
|
data-placeholder="<%= __('Leave empty to show all lists') %>"
|
||||||
multiple
|
multiple
|
||||||
>
|
>
|
||||||
<% for segment in segments %>
|
<% for segment in segments %>
|
||||||
@ -280,7 +280,7 @@
|
|||||||
id="mailpoet_shortcode_archives_list"
|
id="mailpoet_shortcode_archives_list"
|
||||||
data-shortcode="mailpoet_archive"
|
data-shortcode="mailpoet_archive"
|
||||||
data-output="mailpoet_shortcode_archives"
|
data-output="mailpoet_shortcode_archives"
|
||||||
placeholder="<%= __('Leave empty to show all lists') %>"
|
data-placeholder="<%= __('Leave empty to show all lists') %>"
|
||||||
multiple
|
multiple
|
||||||
>
|
>
|
||||||
<% for segment in segments %>
|
<% for segment in segments %>
|
||||||
@ -316,7 +316,7 @@
|
|||||||
id="mailpoet_shortcode_subscribers_count"
|
id="mailpoet_shortcode_subscribers_count"
|
||||||
data-shortcode="mailpoet_subscribers_count"
|
data-shortcode="mailpoet_subscribers_count"
|
||||||
data-output="mailpoet_shortcode_subscribers"
|
data-output="mailpoet_shortcode_subscribers"
|
||||||
placeholder="<%= __('Leave empty to show all lists') %>"
|
data-placeholder="<%= __('Leave empty to show all lists') %>"
|
||||||
multiple
|
multiple
|
||||||
>
|
>
|
||||||
<% for segment in segments %>
|
<% for segment in segments %>
|
||||||
|
Reference in New Issue
Block a user