opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Order history.{active,visible}_dataset_collections by hid instead of id.

Browse Source
This commit is contained in:
John Chilton
2014-05-15 12:04:58 -05:00
parent ededf2451d
commit f1a322bc91
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/model/mapping.py
+3 -3
View File
@@ -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" ),