From e35e97cdbf81f3afc80f78831f287bbfea709ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= <t.9b5as@gmail.com>
Date: Mon, 11 Apr 2016 16:27:26 +0300
Subject: [PATCH] Fix Select2 integration in Form component

---
 assets/js/src/form/fields/selection.jsx      | 11 ++++-------
 assets/js/src/newsletters/types/standard.jsx |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx
index 3c4442b4fc..04f01a2e39 100644
--- a/assets/js/src/form/fields/selection.jsx
+++ b/assets/js/src/form/fields/selection.jsx
@@ -14,10 +14,12 @@ function(
       return {
         items: [],
         initialized: false
-      }
+      };
+    },
+    componentWillMount: function() {
+      this.loadCachedItems();
     },
     componentDidMount: function() {
-      this.loadCachedItems();
       this.setupSelect2();
     },
     componentDidUpdate: function(prevProps, prevState) {
@@ -70,11 +72,6 @@ function(
 
       select2.on('change', this.handleChange);
 
-      select2.select2(
-        'val',
-        this.getSelectedValues()
-      );
-
       this.setState({ initialized: true });
     },
     getSelectedValues: function() {
diff --git a/assets/js/src/newsletters/types/standard.jsx b/assets/js/src/newsletters/types/standard.jsx
index ec6bc091c5..c5c532dcc0 100644
--- a/assets/js/src/newsletters/types/standard.jsx
+++ b/assets/js/src/newsletters/types/standard.jsx
@@ -28,7 +28,6 @@ define(
             type: 'standard',
           }
         }).done(function(response) {
-          console.log(response);
           if(response.result && response.newsletter.id) {
             this.showTemplateSelection(response.newsletter.id);
           } else {