diff --git a/client/src/schema/schema.ts b/client/src/schema/schema.ts index d932c01f96e5..891b4bd83eb0 100644 --- a/client/src/schema/schema.ts +++ b/client/src/schema/schema.ts @@ -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. diff --git a/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js b/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js index bec0b8b510a8..89063ee29a35 100644 --- a/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js +++ b/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js @@ -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, { diff --git a/lib/galaxy/schema/invocation.py b/lib/galaxy/schema/invocation.py index fa0e741966ef..0d2617a25862 100644 --- a/lib/galaxy/schema/invocation.py +++ b/lib/galaxy/schema/invocation.py @@ -53,7 +53,10 @@ def get(self, key: Any, default: Any = None) -> Any: if key == "workflow_step_id": return self._obj.workflow_step.order_index elif key == "dependent_workflow_step_id": - return self._obj.dependent_workflow_step.order_index + if self._obj.dependent_workflow_step_id: + return self._obj.dependent_workflow_step.order_index + else: + return default return super().get(key, default) diff --git a/lib/galaxy/webapps/galaxy/api/history_contents.py b/lib/galaxy/webapps/galaxy/api/history_contents.py index bd3c12900fe0..03ab15a0638f 100644 --- a/lib/galaxy/webapps/galaxy/api/history_contents.py +++ b/lib/galaxy/webapps/galaxy/api/history_contents.py @@ -838,7 +838,7 @@ def delete_typed( 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),