From 2dfa0b5f0ed3c38b608a83215ff36d31558d35f6 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 23 Sep 2021 09:44:46 +0200
Subject: [PATCH] Move setupSettings() in constructor

---
 dev/Screen/AbstractSettings.js |  4 ----
 dev/Screen/Admin/Settings.js   |  2 --
 dev/Screen/User/Settings.js    | 16 ++++------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js
index 052857a0f..8fd954d2d 100644
--- a/dev/Screen/AbstractSettings.js
+++ b/dev/Screen/AbstractSettings.js
@@ -18,12 +18,8 @@ export class AbstractSettingsScreen extends AbstractScreen {
 		this.menu = ko.observableArray();
 
 		this.oCurrentSubScreen = null;
-
-		this.setupSettings();
 	}
 
-	setupSettings() {}
-
 	onRoute(subName) {
 		let settingsScreen = null,
 			viewModelDom = null,
diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js
index bb6b6596b..0e3ad3f3b 100644
--- a/dev/Screen/Admin/Settings.js
+++ b/dev/Screen/Admin/Settings.js
@@ -17,9 +17,7 @@ import { PaneSettingsAdminView } from 'View/Admin/Settings/Pane';
 export class SettingsAdminScreen extends AbstractSettingsScreen {
 	constructor() {
 		super([MenuSettingsAdminView, PaneSettingsAdminView]);
-	}
 
-	setupSettings() {
 		settingsAddViewModel(
 			GeneralAdminSettings,
 			'AdminSettingsGeneral',
diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index 3bd3e7c2e..73291a9b1 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -26,17 +26,6 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 	constructor() {
 		super([SystemDropDownSettingsUserView, MenuSettingsUserView, PaneSettingsUserView]);
 
-		initOnStartOrLangChange(
-			() => this.sSettingsTitle = i18n('TITLES/SETTINGS'),
-			() => this.setSettingsTitle()
-		);
-	}
-
-	setupSettings() {
-		if (!Settings.capa(Capa.Settings)) {
-			return false;
-		}
-
 		settingsAddViewModel(GeneralUserSettings, 'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
 
 		if (AppUserStore.allowContacts()) {
@@ -74,7 +63,10 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 
 		runSettingsViewModelHooks(false);
 
-		return true;
+		initOnStartOrLangChange(
+			() => this.sSettingsTitle = i18n('TITLES/SETTINGS'),
+			() => this.setSettingsTitle()
+		);
 	}
 
 	onShow() {