Honour default_url_params from user_infos when falling back to defaul…

… theme
qgis · Mar 7, 2024 · f9c61ba · f9c61ba
1 parent 4eaef07
commit f9c61ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/components/StandardApp.jsx b/components/StandardApp.jsx
@@ -64,7 +64,8 @@ class AppInitComponent extends React.Component {
         setCurrentTheme: PropTypes.func,
         setStartupParameters: PropTypes.func,
         showNotification: PropTypes.func,
-        themesLoaded: PropTypes.func
+        themesLoaded: PropTypes.func,
+        userInfos: PropTypes.object
     };
     constructor(props) {
         super(props);
@@ -100,7 +101,6 @@ class AppInitComponent extends React.Component {
                 if (!success) {
                     this.props.showNotification("missingtheme", LocaleUtils.tr("app.missingpermalink"), NotificationType.WARN, true);
                 }
-                this.props.setStartupParameters({...params});
                 let theme = ThemeUtils.getThemeById(themes,  params.t);
                 if (!theme || theme.restricted) {
                     if (ConfigUtils.getConfigProp("dontLoadDefaultTheme")) {
@@ -110,8 +110,11 @@ class AppInitComponent extends React.Component {
                         this.props.showNotification("missingtheme", LocaleUtils.tr("app.missingtheme", params.t), NotificationType.WARN, true);
                         params.l = undefined;
                     }
-                    theme = ThemeUtils.getThemeById(themes, themes.defaultTheme);
+                    const defaultTheme = Object.fromEntries(this.props.userInfos?.default_url_params.split("&").map(x => x.split("="))).t || themes.defaultTheme;
+                    theme = ThemeUtils.getThemeById(themes, defaultTheme);
+                    params.t = defaultTheme;
                 }
+                this.props.setStartupParameters({...params});
                 const layerParams = params.l !== undefined ? params.l.split(",").filter(entry => entry) : null;
                 if (layerParams && ConfigUtils.getConfigProp("urlReverseLayerOrder")) {
                     layerParams.reverse();
@@ -168,6 +171,7 @@ class AppInitComponent extends React.Component {
 const AppInit = connect(state => ({
     mapSize: state.map.size,
     layers: state.layers.flat,
+    userInfos: state.localConfig.user_infos,
     currentTask: state.task.id
 }), {
     themesLoaded: themesLoaded,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2024.03.06-master",
+    "version": "2024.03.07-master",
     "description": "QGIS Web Client 2 core",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",