Merge branch 'release_21.05' into release_21.09

galaxyproject · Sep 20, 2024 · 0a03998 · 0a03998
2 parents 72bfa2b + 9a9c4a8
commit 0a03998
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 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/model/store/__init__.py b/lib/galaxy/model/store/__init__.py
@@ -292,10 +292,11 @@ def remap_objects(p, k, obj):
                 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)