From 64501a914a059b14ec802c84d1576eae12b02e5c Mon Sep 17 00:00:00 2001
From: Jonathan Labreuille <jonathan@mailpoet.com>
Date: Tue, 26 Jan 2016 11:36:20 +0100
Subject: [PATCH] removed parsley validation on step 3 - fixed placeholder for
 select2 instances in settings - fixed issue in sending queue worker when
 newsletter does not exist

---
 assets/js/src/form/fields/selection.jsx |  2 +-
 assets/js/src/newsletters/send.jsx      | 11 +----------
 lib/Cron/Workers/SendingQueue.php       | 12 ++++++++----
 views/settings/basics.html              | 10 +++++-----
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx
index 04beac95f3..8b50caf3c3 100644
--- a/assets/js/src/form/fields/selection.jsx
+++ b/assets/js/src/form/fields/selection.jsx
@@ -120,7 +120,7 @@ function(
         <select
           id={ this.props.field.id || this.props.field.name }
           ref="select"
-          placeholder={ this.props.field.placeholder }
+          data-placeholder={ this.props.field.placeholder }
           multiple={ this.props.field.multiple }
           defaultValue={ default_value }
           {...this.props.field.validation}
diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index 94a3534917..5c5e52769e 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -145,14 +145,6 @@ define(
           }.bind(this));
         }
       },
-      componentDidMount: function() {
-        if(this.isMounted()) {
-          jQuery('#mailpoet_newsletter').parsley();
-        }
-      },
-      isValid: function() {
-        return (jQuery('#mailpoet_newsletter').parsley().validate());
-      },
       render: function() {
         return (
           <div>
@@ -166,8 +158,7 @@ define(
               fields={ fields }
               params={ this.props.params }
               messages={ messages }
-              isValid={ this.isValid }>
-
+            >
               <p className="submit">
                 <input
                   className="button button-primary"
diff --git a/lib/Cron/Workers/SendingQueue.php b/lib/Cron/Workers/SendingQueue.php
index 86badc7421..36f1b43e4a 100644
--- a/lib/Cron/Workers/SendingQueue.php
+++ b/lib/Cron/Workers/SendingQueue.php
@@ -19,11 +19,15 @@ class SendingQueue {
   function process() {
     // TODO: implement mailer sending frequency limits
     foreach($this->getQueues() as $queue) {
-      $newsletter = Newsletter::findOne($queue->newsletter_id)
-        ->asArray();
-      if(!$newsletter) {
+      $newsletter = Newsletter::findOne($queue->newsletter_id);
+
+      if($newsletter === false) {
+        //TODO: delete queue item if newsletter doesn't exist
         continue;
-      };
+      } else {
+        $newsletter = $newsletter->asArray();
+      }
+
       $mailer = $this->configureMailerForNewsletter($newsletter);
       $newsletter = $this->renderNewsletter($newsletter);
       $subscribers = json_decode($queue->subscribers, true);
diff --git a/views/settings/basics.html b/views/settings/basics.html
index 5b3dfdb5a9..a23dfa175d 100644
--- a/views/settings/basics.html
+++ b/views/settings/basics.html
@@ -109,7 +109,7 @@
             <select
               id="mailpoet_subscribe_on_comment_segments"
               name="subscribe[on_comment][segments][]"
-              placeholder="<%= __('Choose a list') %>"
+              data-placeholder="<%= __('Choose a list') %>"
               multiple
             >
               <% for segment in segments %>
@@ -173,7 +173,7 @@
               <select
                 id="mailpoet_subscribe_on_register_segments"
                 name="subscribe[on_register][segments][]"
-                placeholder="<%= __('Choose a list') %>"
+                data-placeholder="<%= __('Choose a list') %>"
                 multiple
               >
                 <% for segment in segments %>
@@ -239,7 +239,7 @@
           <select
             id="mailpoet_subscription_edit_segments"
             name="subscription[segments][]"
-            placeholder="<%= __('Leave empty to show all lists') %>"
+            data-placeholder="<%= __('Leave empty to show all lists') %>"
             multiple
           >
             <% for segment in segments %>
@@ -280,7 +280,7 @@
             id="mailpoet_shortcode_archives_list"
             data-shortcode="mailpoet_archive"
             data-output="mailpoet_shortcode_archives"
-            placeholder="<%= __('Leave empty to show all lists') %>"
+            data-placeholder="<%= __('Leave empty to show all lists') %>"
             multiple
           >
             <% for segment in segments %>
@@ -316,7 +316,7 @@
             id="mailpoet_shortcode_subscribers_count"
             data-shortcode="mailpoet_subscribers_count"
             data-output="mailpoet_shortcode_subscribers"
-            placeholder="<%= __('Leave empty to show all lists') %>"
+            data-placeholder="<%= __('Leave empty to show all lists') %>"
             multiple
           >
             <% for segment in segments %>