Merge branch 'release_23.2' into release_24.0

galaxyproject · Sep 20, 2024 · 0c48cf6 · 0c48cf6
2 parents 217ac34 + 4a845a4
commit 0c48cf6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/config/plugins/visualizations/editor/templates/editor.mako b/config/plugins/visualizations/editor/templates/editor.mako
@@ -62,11 +62,11 @@
 
     const ajax_url = "${h.url_for( controller='/datasets', action='index')}/" + hda_id + "/display";
     const data = httpGet(ajax_url);
-    document.getElementById("editor").innerHTML = data;
     var editor = ace.edit("editor", {
         mode: "ace/mode/powershell",
         theme: "ace/theme/textmate"
     });
+    editor.setValue(data, -1);
 </script>
 </body>
 </html>
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
@@ -594,7 +594,7 @@ def admin_users(self):
     @admin_users.setter
     def admin_users(self, value):
         self._admin_users = value
-        self.admin_users_list = listify(value)
+        self.admin_users_list = listify(value, do_strip=True)
 
     def is_admin_user(self, user: Optional["User"]) -> bool:
         """Determine if the provided user is listed in `admin_users`."""

diff --git a/lib/galaxy/model/store/__init__.py b/lib/galaxy/model/store/__init__.py
@@ -575,10 +575,11 @@ def handle_dataset_object_edit(dataset_instance, dataset_attrs):
                 self._attach_raw_id_if_editing(dataset_instance, dataset_attrs)
 
                 # Older style...
-                if "uuid" in dataset_attrs:
-                    dataset_instance.dataset.uuid = dataset_attrs["uuid"]
-                if "dataset_uuid" in dataset_attrs:
-                    dataset_instance.dataset.uuid = dataset_attrs["dataset_uuid"]
+                if self.import_options.allow_edit:
+                    if "uuid" in dataset_attrs:
+                        dataset_instance.dataset.uuid = dataset_attrs["uuid"]
+                    if "dataset_uuid" in dataset_attrs:
+                        dataset_instance.dataset.uuid = dataset_attrs["dataset_uuid"]
 
                 self._session_add(dataset_instance)