Skip to content

Commit

Permalink
Copy the collection contents by default when copying a collection
Browse files Browse the repository at this point in the history
That got left out when creating the new multi history view.
Fixes #16716 and
#16619.
  • Loading branch information
mvdbeek committed Sep 21, 2023
1 parent 1eabd67 commit 53074a0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions client/src/schema/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2445,8 +2445,8 @@ export interface components {
content?: string | string;
/**
* Copy Elements
* @description If the source is a collection, whether to copy child HDAs into the target history as well, defaults to False but this is less than ideal and may be changed in future releases.
* @default false
* @description If the source is a collection, whether to copy child HDAs into the target history as well. Prior to the galaxy release 23.1 this defaulted to false.
* @default true
*/
copy_elements?: boolean;
/**
Expand Down Expand Up @@ -2616,7 +2616,7 @@ export interface components {
/**
* Copy Elements
* @description Whether to create a copy of the source HDAs for the new collection.
* @default false
* @default true
*/
copy_elements?: boolean;
/**
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/schema/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,7 @@ class CreateNewCollectionPayload(Model):
description="Whether to mark the original HDAs as hidden.",
)
copy_elements: Optional[bool] = Field(
default=False,
default=True,
title="Copy Elements",
description="Whether to create a copy of the source HDAs for the new collection.",
)
Expand Down
5 changes: 2 additions & 3 deletions lib/galaxy/webapps/galaxy/services/history_contents.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,11 @@ class CreateHistoryContentPayloadFromCollection(CreateHistoryContentPayloadFromC
description="TODO",
)
copy_elements: Optional[bool] = Field(
default=False,
default=True,
title="Copy Elements",
description=(
"If the source is a collection, whether to copy child HDAs into the target "
"history as well, defaults to False but this is less than ideal and may "
"be changed in future releases."
"history as well. Prior to the galaxy release 23.1 this defaulted to false."
),
)

Expand Down

0 comments on commit 53074a0

Please sign in to comment.