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

Fix displaying an error message when a user cannot view a history. Previously, it was throwing a server error when it was attempting to display from an empty history_dict.

Browse Source
This commit is contained in:
Daniel Blankenberg
2015-03-20 17:18:08 -04:00
parent baf6b8b114
commit 59b18ef4ff
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/history.py
+7 -3
View File
@@ -605,9 +605,13 @@ class HistoryController( BaseUIController, SharableMixin, UsesAnnotations, UsesI
except Exception, exc:
user_id = str( trans.user.id ) if trans.user else '(anonymous)'
log.exception( 'Error bootstrapping history for user %s: %s', user_id, str( exc ) )
history_dictionary[ 'error' ] = ( 'An error occurred getting the history data from the server. '
+ 'Please contact a Galaxy administrator if the problem persists.' )
log.exception( 'Error bootstrapping history for user %s: %s', user_id, exc )
if isinstance( exc, exceptions.ItemAccessibilityException ):
error_msg = 'You do not have permission to view this history.'
else:
error_msg = ( 'An error occurred getting the history data from the server. '
+ 'Please contact a Galaxy administrator if the problem persists.' )
return trans.show_error_message( error_msg, use_panels=use_panels )
return trans.fill_template_mako( "history/view.mako",
history=history_dictionary, hdas=hda_dictionaries, user_is_owner=user_is_owner,