Unverified Commit 6bb9bc69 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_23.0' into release_23.1

parents f68da3c3 1e969700

client/src/schema/schema.ts

+1 −1
Original line number Diff line number Diff line
@@ -12707,7 +12707,7 @@ export interface operations { 
            header?: {

                "run-as"?: string;

            };

            /** @description The ID of the History. */

            /** @description History ID or any string. */

            /** @description The ID of the item (`HDA`/`HDCA`) contained in the history. */

            /**

             * @description The type of the target history element.

config/plugins/visualizations/jqplot/jqplot_bar/src/script.js

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ window.bundleEntries.jqplot_box = function (options) { 
            chart               : options.chart,

            dataset_id          : dataset.id,

            dataset_groups      : dataset_groups,

            targets             : options.targets,

            target              : options.target,

            makeConfig          : function( groups, plot_config ){

                var boundary = getDomains( groups, 'x' );

                $.extend( true, plot_config, {

lib/galaxy/schema/invocation.py

+4 −1
Original line number Diff line number Diff line
@@ -53,7 +53,10 @@ class StepOrderIndexGetter(GetterDict): 
        if key == "workflow_step_id":

            return self._obj.workflow_step.order_index

        elif key == "dependent_workflow_step_id":

            if self._obj.dependent_workflow_step_id:

                return self._obj.dependent_workflow_step.order_index

            else:

                return default



        return super().get(key, default)

lib/galaxy/webapps/galaxy/api/history_contents.py

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ class FastAPIHistoryContents: 
        self,

        response: Response,

        trans: ProvidesHistoryContext = DependsOnTrans,

        history_id: DecodedDatabaseIdField = HistoryIDPathParam,

        history_id: str = Path(..., description="History ID or any string."),

        id: DecodedDatabaseIdField = HistoryItemIDPathParam,

        type: HistoryContentType = ContentTypePathParam,

        serialization_params: SerializationParams = Depends(query_serialization_params),