From f1a322bc9146a31f5dbea59dab669c415b861d12 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 15 May 2014 12:04:58 -0500 Subject: [PATCH] Order history.{active,visible}_dataset_collections by hid instead of id. --- lib/galaxy/model/mapping.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py index 13e5821616d..b42585ae325 100644 --- a/lib/galaxy/model/mapping.py +++ b/lib/galaxy/model/mapping.py @@ -1461,9 +1461,9 @@ mapper( model.History, model.History.table, model.HistoryDatasetCollectionAssociation, primaryjoin=( ( model.HistoryDatasetCollectionAssociation.table.c.history_id ) == model.History.table.c.id ) & not_( model.HistoryDatasetCollectionAssociation.table.c.deleted ), - order_by=asc( model.HistoryDatasetCollectionAssociation.table.c.id ), + order_by=asc( model.HistoryDatasetCollectionAssociation.table.c.hid ), viewonly=True, - ), # TODO:orderbyhid + ), visible_datasets=relation( model.HistoryDatasetAssociation, primaryjoin=( ( model.HistoryDatasetAssociation.table.c.history_id == model.History.table.c.id ) & not_( model.HistoryDatasetAssociation.table.c.deleted ) & model.HistoryDatasetAssociation.table.c.visible ), @@ -1473,7 +1473,7 @@ mapper( model.History, model.History.table, visible_dataset_collections=relation( model.HistoryDatasetCollectionAssociation, primaryjoin=( ( model.HistoryDatasetCollectionAssociation.table.c.history_id == model.History.table.c.id ) & not_( model.HistoryDatasetCollectionAssociation.table.c.deleted ) & model.HistoryDatasetCollectionAssociation.table.c.visible ), - order_by=asc( model.HistoryDatasetCollectionAssociation.table.c.id ), + order_by=asc( model.HistoryDatasetCollectionAssociation.table.c.hid ), viewonly=True, ), tags=relation( model.HistoryTagAssociation, order_by=model.HistoryTagAssociation.table.c.id, backref="histories" ),