From def30523201e5749ac5681bbe87e08469a3d8ca7 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 25 Oct 2013 15:32:18 -0400 Subject: [PATCH 1/3] Close search branch. From 8471e4aa0f3221e18b772acb24b56ea2b2096d76 Mon Sep 17 00:00:00 2001 From: Kyle Ellrott Date: Fri, 15 Nov 2013 11:46:52 -0800 Subject: [PATCH 2/3] Adding in history_id selection to hda view, so hda elements can be selected by their parent history --- lib/galaxy/model/search.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/model/search.py b/lib/galaxy/model/search.py index ec22c5f5f3f..a4f7aef6ed4 100644 --- a/lib/galaxy/model/search.py +++ b/lib/galaxy/model/search.py @@ -297,6 +297,7 @@ class HistoryDatasetView(ViewQueryBaseClass): FIELDS = { 'name' : ViewField('name', sqlalchemy_field=HistoryDatasetAssociation.name), 'id' : ViewField('id',sqlalchemy_field=HistoryDatasetAssociation.id, id_decode=True), + 'history_id' : ViewField('history_id',sqlalchemy_field=HistoryDatasetAssociation.history_id, id_decode=True), 'tag' : ViewField("tag", handler=history_dataset_handle_tag), 'copied_from_ldda_id' : ViewField("copied_from_ldda_id", sqlalchemy_field=HistoryDatasetAssociation.copied_from_library_dataset_dataset_association_id, From a9b85f345d642177fa141ed67cbe35649a9f8db8 Mon Sep 17 00:00:00 2001 From: Kyle Ellrott Date: Fri, 15 Nov 2013 15:26:24 -0800 Subject: [PATCH 3/3] Adding 'copied_from_hda_id' field to hda view. --- lib/galaxy/model/search.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/galaxy/model/search.py b/lib/galaxy/model/search.py index a4f7aef6ed4..5365d42ebcc 100644 --- a/lib/galaxy/model/search.py +++ b/lib/galaxy/model/search.py @@ -302,6 +302,9 @@ class HistoryDatasetView(ViewQueryBaseClass): 'copied_from_ldda_id' : ViewField("copied_from_ldda_id", sqlalchemy_field=HistoryDatasetAssociation.copied_from_library_dataset_dataset_association_id, id_decode=True), + 'copied_from_hda_id' : ViewField("copied_from_hda_id", + sqlalchemy_field=HistoryDatasetAssociation.copied_from_history_dataset_association_id, + id_decode=True), 'deleted' : ViewField('deleted', sqlalchemy_field=HistoryDatasetAssociation.deleted) }