Merge branch 'release_24.0' into dev

galaxyproject · Mar 29, 2024 · 4456cc1 · 4456cc1
2 parents 866d1f9 + e10ed2e
commit 4456cc1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/client/src/components/User/UserPreferences.vue b/client/src/components/User/UserPreferences.vue
@@ -191,12 +191,20 @@ export default {
             return Object.fromEntries(enabledPreferences);
         },
         hasLogout() {
-            const Galaxy = getGalaxyInstance();
-            return !!Galaxy.session_csrf_token && !this.config.single_user;
+            if (this.isConfigLoaded) {
+                const Galaxy = getGalaxyInstance();
+                return !!Galaxy.session_csrf_token && !this.config.single_user;
+            } else {
+                return false;
+            }
         },
         hasThemes() {
-            const themes = Object.keys(this.config.themes);
-            return themes?.length > 1 ?? false;
+            if (this.isConfigLoaded) {
+                const themes = Object.keys(this.config.themes);
+                return themes?.length > 1 ?? false;
+            } else {
+                return false;
+            }
         },
         userPermissionsUrl() {
             return withPrefix("/user/permissions");

diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
@@ -1895,11 +1895,10 @@ def _parse_formats(self, trans, input_source):
         """
         Build list of classes for supported data formats
         """
-        self.extensions = input_source.get("format", "data").split(",")
+        self.extensions = [extension.strip().lower() for extension in input_source.get("format", "data").split(",")]
         formats = []
         if self.datatypes_registry:  # This may be None when self.tool.app is a ValidationContext
-            normalized_extensions = [extension.strip().lower() for extension in self.extensions]
-            for extension in normalized_extensions:
+            for extension in self.extensions:
                 datatype = self.datatypes_registry.get_datatype_by_extension(extension)
                 if datatype is not None:
                     formats.append(datatype)