Fixed Error in migrate-lists-to-per-swimlane migration.

Thanks to xet7 !

Fixes #5918

client/components/settings/attachmentSettings.js

@@ -1,37 +1,6 @@
 import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 
-// Template helpers for attachmentSettings
-Template.attachmentSettings.helpers({
-  loading() {
-    const instance = Template.instance();
-    if (instance && instance.loading) {
-      return instance.loading.get();
-    }
-    return attachmentSettings.loading.get();
-  },
-  showStorageSettings() {
-    const instance = Template.instance();
-    if (instance && instance.showStorageSettings) {
-      return instance.showStorageSettings.get();
-    }
-    return attachmentSettings.showStorageSettings.get();
-  },
-  showMigration() {
-    const instance = Template.instance();
-    if (instance && instance.showMigration) {
-      return instance.showMigration.get();
-    }
-    return attachmentSettings.showMigration.get();
-  },
-  showMonitoring() {
-    const instance = Template.instance();
-    if (instance && instance.showMonitoring) {
-      return instance.showMonitoring.get();
-    }
-    return attachmentSettings.showMonitoring.get();
-  }
-});
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Tracker } from 'meteor/tracker';
@@ -102,6 +71,20 @@ BlazeComponent.extendComponent({
     this.loadMonitoringData();
   },
 
+  // Template helpers for this component
+  loading() {
+    return this.loading.get();
+  },
+  showStorageSettings() {
+    return this.showStorageSettings.get();
+  },
+  showMigration() {
+    return this.showMigration.get();
+  },
+  showMonitoring() {
+    return this.showMonitoring.get();
+  },
+
   events() {
     return [
       {
@@ -497,5 +480,25 @@ BlazeComponent.extendComponent({
   }
 }).register('attachmentMonitoring');
 
+// Template helpers for attachmentSettings
+Template.attachmentSettings.helpers({
+  loading() {
+    const instance = Template.instance();
+    return instance.loading && instance.loading.get();
+  },
+  showStorageSettings() {
+    const instance = Template.instance();
+    return instance.showStorageSettings && instance.showStorageSettings.get();
+  },
+  showMigration() {
+    const instance = Template.instance();
+    return instance.showMigration && instance.showMigration.get();
+  },
+  showMonitoring() {
+    const instance = Template.instance();
+    return instance.showMonitoring && instance.showMonitoring.get();
+  },
+});
+
 // Export the attachment settings for use in other components
 export { attachmentSettings };

client/components/settings/cronSettings.js

@@ -526,3 +526,27 @@ function pollMigrationProgress(instance) {
     });
   }, 1000);
 }
+
+// Template helpers for cronSettings
+Template.cronSettings.helpers({
+  loading() {
+    const instance = Template.instance();
+    return instance.loading && instance.loading.get();
+  },
+  showMigrations() {
+    const instance = Template.instance();
+    return instance.showMigrations && instance.showMigrations.get();
+  },
+  showBoardOperations() {
+    const instance = Template.instance();
+    return instance.showBoardOperations && instance.showBoardOperations.get();
+  },
+  showJobs() {
+    const instance = Template.instance();
+    return instance.showJobs && instance.showJobs.get();
+  },
+  showAddJob() {
+    const instance = Template.instance();
+    return instance.showAddJob && instance.showAddJob.get();
+  },
+});

client/components/settings/settingBody.js

@@ -3,86 +3,6 @@ import { TAPi18n } from '/imports/i18n';
 import { ALLOWED_WAIT_SPINNERS } from '/config/const';
 import LockoutSettings from '/models/lockoutSettings';
 
-// Template helpers for settingBody
-Template.setting.helpers({
-  generalSetting() {
-    const instance = Template.instance();
-    if (instance && instance.generalSetting) {
-      return instance.generalSetting.get();
-    }
-    return false;
-  },
-  emailSetting() {
-    const instance = Template.instance();
-    if (instance && instance.emailSetting) {
-      return instance.emailSetting.get();
-    }
-    return false;
-  },
-  accountSetting() {
-    const instance = Template.instance();
-    if (instance && instance.accountSetting) {
-      return instance.accountSetting.get();
-    }
-    return false;
-  },
-  tableVisibilityModeSetting() {
-    const instance = Template.instance();
-    if (instance && instance.tableVisibilityModeSetting) {
-      return instance.tableVisibilityModeSetting.get();
-    }
-    return false;
-  },
-  announcementSetting() {
-    const instance = Template.instance();
-    if (instance && instance.announcementSetting) {
-      return instance.announcementSetting.get();
-    }
-    return false;
-  },
-  accessibilitySetting() {
-    const instance = Template.instance();
-    if (instance && instance.accessibilitySetting) {
-      return instance.accessibilitySetting.get();
-    }
-    return false;
-  },
-  layoutSetting() {
-    const instance = Template.instance();
-    if (instance && instance.layoutSetting) {
-      return instance.layoutSetting.get();
-    }
-    return false;
-  },
-  webhookSetting() {
-    const instance = Template.instance();
-    if (instance && instance.webhookSetting) {
-      return instance.webhookSetting.get();
-    }
-    return false;
-  },
-  attachmentSettings() {
-    const instance = Template.instance();
-    if (instance && instance.attachmentSettings) {
-      return instance.attachmentSettings.get();
-    }
-    return false;
-  },
-  cronSettings() {
-    const instance = Template.instance();
-    if (instance && instance.cronSettings) {
-      return instance.cronSettings.get();
-    }
-    return false;
-  },
-  loading() {
-    const instance = Template.instance();
-    if (instance && instance.loading) {
-      return instance.loading.get();
-    }
-    return false;
-  }
-});
 
 BlazeComponent.extendComponent({
   onCreated() {
@@ -110,6 +30,7 @@ BlazeComponent.extendComponent({
     Meteor.subscribe('lockoutSettings');
   },
 
+
   setError(error) {
     this.error.set(error);
   },
@@ -667,3 +588,51 @@ Template.selectSpinnerName.helpers({
     return Template.instance().data.spinnerName === match;
   },
 });
+
+// Template helpers for the setting template
+Template.setting.helpers({
+  generalSetting() {
+    const instance = Template.instance();
+    return instance.generalSetting && instance.generalSetting.get();
+  },
+  emailSetting() {
+    const instance = Template.instance();
+    return instance.emailSetting && instance.emailSetting.get();
+  },
+  accountSetting() {
+    const instance = Template.instance();
+    return instance.accountSetting && instance.accountSetting.get();
+  },
+  tableVisibilityModeSetting() {
+    const instance = Template.instance();
+    return instance.tableVisibilityModeSetting && instance.tableVisibilityModeSetting.get();
+  },
+  announcementSetting() {
+    const instance = Template.instance();
+    return instance.announcementSetting && instance.announcementSetting.get();
+  },
+  accessibilitySetting() {
+    const instance = Template.instance();
+    return instance.accessibilitySetting && instance.accessibilitySetting.get();
+  },
+  layoutSetting() {
+    const instance = Template.instance();
+    return instance.layoutSetting && instance.layoutSetting.get();
+  },
+  webhookSetting() {
+    const instance = Template.instance();
+    return instance.webhookSetting && instance.webhookSetting.get();
+  },
+  attachmentSettings() {
+    const instance = Template.instance();
+    return instance.attachmentSettings && instance.attachmentSettings.get();
+  },
+  cronSettings() {
+    const instance = Template.instance();
+    return instance.cronSettings && instance.cronSettings.get();
+  },
+  loading() {
+    const instance = Template.instance();
+    return instance.loading && instance.loading.get();
+  },
+});