details: http://www.bx.psu.edu/hg/galaxy/rev/0dd1676e5b6f changeset: 3691:0dd1676e5b6f user: Dan Blankenberg dan@bx.psu.edu date: Fri Apr 23 17:04:39 2010 -0400 description: Some fixes for the async datasource tool controller.
diffstat:
lib/galaxy/web/controllers/async.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diffs (19 lines):
diff -r 7ae394334e5c -r 0dd1676e5b6f lib/galaxy/web/controllers/async.py --- a/lib/galaxy/web/controllers/async.py Fri Apr 23 16:32:40 2010 -0400 +++ b/lib/galaxy/web/controllers/async.py Fri Apr 23 17:04:39 2010 -0400 @@ -108,8 +108,8 @@ data.name = GALAXY_NAME data.dbkey = GALAXY_BUILD data.info = GALAXY_INFO + trans.sa_session.add( data ) #Need to add data to session before setting state (setting state requires that the data object is in the session, but this may change) data.state = data.states.NEW - trans.sa_session.add( data ) open( data.file_name, 'wb' ).close() #create the file trans.history.add_dataset( data, genome_build=GALAXY_BUILD ) trans.sa_session.add( trans.history ) @@ -135,4 +135,4 @@
trans.sa_session.flush()
- return trans.fill_template('tool_executed.tmpl', out_data={}, tool=tool, config=self.app.config ) + return trans.fill_template( 'tool_executed.mako', history=history, toolbox=toolbox, tool=tool, util=util, out_data={} )
galaxy-commits@lists.galaxyproject.org