details: http://www.bx.psu.edu/hg/galaxy/rev/4a670e8f4248 changeset: 3539:4a670e8f4248 user: fubar: ross Lazarus at gmail period com date: Tue Mar 16 15:32:05 2010 -0400 description: Fix for 'add' action in act_on_multiple_datasets - and a warning message if any bogus action supplied - fixes issue #297
diffstat:
lib/galaxy/web/controllers/library_common.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diffs (31 lines):
diff -r aad7b294ffca -r 4a670e8f4248 lib/galaxy/web/controllers/library_common.py --- a/lib/galaxy/web/controllers/library_common.py Tue Mar 16 15:09:22 2010 -0400 +++ b/lib/galaxy/web/controllers/library_common.py Tue Mar 16 15:32:05 2010 -0400 @@ -1257,7 +1257,7 @@ messagetype = 'error' else: ldda_ids = util.listify( ldda_ids ) - if action == 'import_to_history': + if action == 'import_to_history' or action == 'add': history = trans.get_history() if history is None: # Must be a bot sending a request without having a history. @@ -1308,7 +1308,7 @@ trans.sa_session.add( ld ) trans.sa_session.flush() msg = "The selected datasets have been removed from this data library" - else: + elif action in ['zip','tgz','tbz']: error = False killme = string.punctuation + string.whitespace trantab = string.maketrans(killme,'_'*len(killme)) @@ -1416,6 +1416,9 @@ archive.wsgi_status = trans.response.wsgi_status() archive.wsgi_headeritems = trans.response.wsgi_headeritems() return archive.stream + else: # unknown action + msg = '### unknown action = %s in act_on_multiple_datasets' % action + return trans.response.send_redirect( web.url_for( controller='library_common', action='browse_library', cntrller=cntrller,