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

Merge pull request #217 from guerler/fix_missing_history

Browse Source 
[15.05] Create empty history if history is unavailable during api call
This commit is contained in:
Dannon Baker
2015-05-06 09:48:00 -04:00
parent 4154af424c f0f2f397ff
commit bb75068fe0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+1 -1
View File
@@ -1634,7 +1634,7 @@ class BaseDataToolParameter( ToolParameter ):
class_name = self.__class__.__name__
assert trans is not None, "%s requires a trans" % class_name
if history is None:
history = trans.get_history()
history = trans.get_history( create=True )
assert history is not None, "%s requires a history" % class_name
return history
test/unit/tools/test_data_parameters.py
+1 -1
View File
@@ -150,7 +150,7 @@ class DataToolParameterTestCase( BaseParameterTestCase ):
self.app.model.context.flush()
self.trans = bunch.Bunch(
app=self.app,
get_history=lambda: self.test_history,
get_history=lambda **k: self.test_history,
get_current_user_roles=lambda: [],
workflow_building_mode=False,
webapp=bunch.Bunch( name="galaxy" ),
test/unit/tools/test_execution.py
+1 -1
View File
@@ -478,7 +478,7 @@ class MockTrans( object ):
self.webapp = Bunch( name="galaxy" )
self.sa_session = self.app.model.context
def get_history( self ):
def get_history( self, **kwargs ):
return self.history
test/unit/unittest_utils/galaxy_mock.py
+1 -1
View File
@@ -91,7 +91,7 @@ class MockTrans( object ):
user = property( get_user, set_user )
def get_history( self ):
def get_history( self, **kwargs ):
return self.history
def set_history( self, history ):