4 files changed, 26 insertions, 4 deletions
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index 4ec4b534..6c9600a1 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -1,6 +1,13 @@
 const subManager = new SubsManager();
 
 BlazeComponent.extendComponent({
+  onCreated() {
+    // Here is the only place that boards data needed, all boards data will stop sync when leaving this template.
+    Meteor.subscribe('boards');
+    Meteor.subscribe('setting');
+    Meteor.subscribe('user-admin');
+  },
+
   boards() {
     return Boards.find({
       archived: false,
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 1936d7aa..04a22624 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -1,7 +1,3 @@
-Meteor.subscribe('boards');
-Meteor.subscribe('setting');
-Meteor.subscribe('user-admin');
-
 BlazeLayout.setRoot('body');
 
 const i18nTagToT9n = (i18nTag) => {
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 2152cc2c..479ccd3e 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -89,6 +89,9 @@ template(name='email')
     li
       button.js-save.primary {{_ 'save'}}
 
+    li
+      button.js-send-smtp-test-email.primary {{_ 'send-smtp-test'}}
+
 template(name='accountSettings')
   ul#account-setting.setting-detail
     li.smtp-form
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index 27f690ee..5b015918 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -125,6 +125,21 @@ BlazeComponent.extendComponent({
 
   },
 
+  sendSMTPTestEmail() {
+    Meteor.call('sendSMTPTestEmail', (err, ret) => {
+      if (!err && ret) { /* eslint-disable no-console */
+        const message = `${TAPi18n.__(ret.message)}: ${ret.email}`;
+        console.log(message);
+        alert(message);
+      } else {
+        const reason = err.reason || '';
+        const message = `${TAPi18n.__(err.error)}\n${reason}`;
+        console.log(message, err);
+        alert(message);
+      }  /* eslint-enable no-console */
+    });
+  },
+
   events(){
     return [{
       'click a.js-toggle-registration': this.toggleRegistration,
@@ -133,6 +148,7 @@ BlazeComponent.extendComponent({
       'click a.js-toggle-board-choose': this.checkBoard,
       'click button.js-email-invite': this.inviteThroughEmail,
       'click button.js-save': this.saveMailServerInfo,
+      'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
     }];
   },
 }).register('setting');