commit/galaxy-central: dannon: Removed invalid parameter in History.add_dataset, added return of dataset to the method.
1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/fd197cbea3c9/ changeset: r5179:fd197cbea3c9 user: dannon date: 2011-03-05 17:31:41 summary: Removed invalid parameter in History.add_dataset, added return of dataset to the method. Add APIItem to StoredWorkflow. affected #: 1 file (103 bytes) --- a/lib/galaxy/model/__init__.py Fri Mar 04 15:22:17 2011 -0500 +++ b/lib/galaxy/model/__init__.py Sat Mar 05 11:31:41 2011 -0500 @@ -328,7 +328,7 @@ self.galaxy_sessions.append( association ) def add_dataset( self, dataset, parent_id=None, genome_build=None, set_hid = True ): if isinstance( dataset, Dataset ): - dataset = HistoryDatasetAssociation( dataset = dataset, copied_from = dataset ) + dataset = HistoryDatasetAssociation(dataset=dataset) object_session( self ).add( dataset ) object_session( self ).flush() elif not isinstance( dataset, HistoryDatasetAssociation ): @@ -348,6 +348,7 @@ if genome_build not in [None, '?']: self.genome_build = genome_build self.datasets.append( dataset ) + return dataset def copy( self, name=None, target_user=None, activatable=False ): # Create new history. if not name: @@ -1406,7 +1407,9 @@ self.secretKey = None self.credentials = [] -class StoredWorkflow( object ): +class StoredWorkflow( object, APIItem): + api_collection_visible_keys = ( 'id', 'name' ) + api_element_visible_keys = ( 'id', 'name' ) def __init__( self ): self.id = None self.user = None Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket