Unverified Commit ed2369f9 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.0' into release_24.1

parents f42af828 f5610e77

client/src/api/schema/schema.ts

+2 −0
Original line number Diff line number Diff line
@@ -6289,6 +6289,8 @@ export interface components { 
             * @enum {string}

             */

            model_class: "HistoryDatasetAssociation";

            /** Purged */

            purged: boolean;

            /**

             * State

             * @description The current state of this dataset.

client/src/stores/collectionElementsStore.test.ts

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ function mockElement(collectionId: string, i: number): DCESummary { 
            history_id: "1",

            tags: [],

            accessible: true,

            purged: false,

        },

    };

}

lib/galaxy/managers/collections_util.py

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ def dictify_element_reference( 
        else:

            object_details["state"] = element_object.state

            object_details["hda_ldda"] = "hda"

            object_details["purged"] = element_object.purged

            if isinstance(element_object, model.HistoryDatasetAssociation):

                object_details["history_id"] = element_object.history_id

                object_details["tags"] = element_object.make_tag_string_list()

lib/galaxy/schema/schema.py

+1 −0
Original line number Diff line number Diff line
@@ -950,6 +950,7 @@ class HDAObject(Model, WithModelClass): 
    tags: List[str]

    copied_from_ldda_id: Optional[EncodedDatabaseIdField] = None

    accessible: Optional[bool] = None

    purged: bool

    model_config = ConfigDict(extra="allow")

lib/galaxy/tools/parameters/validation.py

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ class InRangeValidator(ExpressionValidator): 
            op1 = "<"

        if self.exclude_max:

            op2 = "<"

        expression = f"float('{self.min}') {op1} value {op2} float('{self.max}')"

        expression = f"float('{self.min}') {op1} float(value) {op2} float('{self.max}')"

        if message is None:

            message = f"Value ('%s') must {'not ' if negate == 'true' else ''}fulfill {expression}"

        super().__init__(message, expression, negate)