Unverified Commit dec1beaa authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #19805 from bernt-matthias/topic/19659-24.1

[24.1] Backport parts of #19659
parents 3eb2ba85 16d4269c
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -781,8 +781,18 @@ class DynamicOptions:
                by_dbkey.update(table_entries)
            for data_table_entry in by_dbkey.values():
                field_entry = []
                if hda := data_table_entry.get("__hda__"):
                    field_entry.append(hda)
                missing_columns = False
                for column_key in self.tool_data_table.columns.keys():
                    if column_key not in data_table_entry:
                        # currrent data table definition (as in self.tool_data_table)
                        # may not match against the data manager bundle.
                        # Breaking here fixes https://github.com/galaxyproject/galaxy/issues/18749.
                        missing_columns = True
                        break
                    field_entry.append(data_table_entry[column_key])
                if not missing_columns:
                    fields.append(field_entry)
        return fields