Commit 69b65ac9 authored by Nate Coraor's avatar Nate Coraor
Browse files

Merge remote-tracking branch 'upstream/release_20.09' into release_20.09

parents d4431511 9169f6c8

client/src/components/LibraryFolder/TopToolbar/import-to-history/import-collection.js

+3 −2
Original line number Diff line number Diff line
@@ -91,11 +91,12 @@ var ImportCollectionModal = Backbone.View.extend({ 
        const new_history_name = this.modal.$("input[name=history_name]").val();

        if (new_history_name !== "") {

            this.createNewHistory(new_history_name)

                .done((new_history) => {

                .then((new_history) => {

                    Toast.success("History created");

                    this.collectionImport(collection_elements, new_history.id, new_history.name);

                })

                .fail((xhr, status, error) => {

                .catch((error) => {

                    console.error(error);

                    Toast.error("An error occurred.");

                });

        } else {

client/src/components/Panels/ToolBoxWorkflow.vue

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
                <tool-section

                    :category="workflowSection"

                    :key="workflowSection.name"

                    section-name="workflows"

                    operation-icon="fa fa-files-o"

                    operation-title="Insert individual steps."

                    :query-filter="query"

client/src/components/Workflow/Editor/Node.vue

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ export default { 
        },

        setData(data) {

            this.config_form = data.config_form;

            this.content_id = this.config_form?.id;

            this.content_id = data.config_form?.id || data.content_id;

            this.tool_state = data.tool_state;

            this.errors = data.errors;

            this.annotation = data.annotation;

client/src/mvc/ui/ui-file-source.js

+14 −3
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ var View = Backbone.View.extend({ 
    render: function () {

        const value = this._value;

        if (value) {

            if (value.url !== this.$text.text()) {

            if (typeof value == "string") {

                this.$text.text(value);

            } else if (value.url !== this.$text.text()) {

                this.$text.text(value.url);

            }

        } else {
@@ -79,18 +81,27 @@ var View = Backbone.View.extend({ 


    /** Returns current value */

    _getValue: function () {

        return this._value.url;

        return this._value?.url;

    },



    /** Sets current value */

    _setValue: function (new_value) {

        if (new_value) {

            if (typeof new_value == "string") {

                new_value = JSON.parse(new_value);

                let parsed_value;

                // if new_value is not a JSON, set it as String

                try {

                    parsed_value = JSON.parse(new_value);

                } catch (e) {

                    parsed_value = new_value;

                } finally {

                    new_value = parsed_value;

                }

            }

            this._value = new_value;

            this.model.trigger("error", null);

            this.model.trigger("change");

            this.trigger("change");

        }

    },

});

doc/source/releases/20.09_announce.rst

+10 −0
Original line number Diff line number Diff line
@@ -76,6 +76,16 @@ To update an existing Galaxy repository run: 


See the `community hub <https://galaxyproject.org/develop/source-code/>`__ for additional details regarding the source code locations.



Release Testing Team

===========================================================



A special thanks to the release testing team for testing many of the new features and reporting many bugs:



- `Jayadev Joshi <https://github.com/jaidevjoshi83>`_

- `Luke Sargent <https://github.com/luke-c-sargent>`_

- `Marius van den Beek <https://github.com/mvdbeek>`_

- `Sergey Golitsynskiy <https://github.com/ic4f>`_



Release Notes

===========================================================