Unverified Commit 80c55eb6 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_23.0' into release_23.1

parents 60d063a1 262d48a7

config/plugins/visualizations/editor/templates/editor.mako

+1 −1
Original line number Diff line number Diff line
@@ -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>

lib/galaxy/model/store/__init__.py

+5 −4
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ class ModelImportStore(metaclass=abc.ABCMeta): 
                self._attach_raw_id_if_editing(dataset_instance, dataset_attrs)



                # Older style...

                if self.import_options.allow_edit:

                    if "uuid" in dataset_attrs:

                        dataset_instance.dataset.uuid = dataset_attrs["uuid"]

                    if "dataset_uuid" in dataset_attrs: