2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/30e0e657a607/ Changeset: 30e0e657a607 Branch: next-stable User: carlfeberhard Date: 2014-11-20 15:31:05+00:00 Summary: History, view multiple: show error when anonymous with links to register and log in Affected #: 1 file diff -r c3ac0d1c84e71e49d04b5ddb2644415111605cbc -r 30e0e657a607b406b899a88d8612d3b6a6602ed6 lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -609,6 +609,14 @@ def view_multiple( self, trans, include_deleted_histories=False, order='update' ): """ """ + if not trans.user: + log_in_url = url_for( controller="user", action="login", use_panels=True ) + log_in_link = "<a href='%s'>log in</a>" % ( log_in_url ) + register_url = url_for( controller="user", action="create", use_panels=True ) + register_link = "<a href='%s'>register</a>" % ( register_url ) + return trans.show_error_message( "You need to %s or %s to use multiple histories" + % ( log_in_link, register_link ), use_panels=True ) + #TODO: allow specifying user_id for admin? include_deleted_histories = galaxy.util.string_as_bool( include_deleted_histories ) order = order if order in ( 'update', 'name', 'size' ) else 'update' https://bitbucket.org/galaxy/galaxy-central/commits/3ec1e82f0fbd/ Changeset: 3ec1e82f0fbd User: carlfeberhard Date: 2014-11-20 15:31:32+00:00 Summary: Merge next-stable Affected #: 1 file diff -r a88cc74c931780f08c9858ac25c3c03324084135 -r 3ec1e82f0fbde4d2cfb390acb4548474ff48d1a9 lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -609,6 +609,14 @@ def view_multiple( self, trans, include_deleted_histories=False, order='update' ): """ """ + if not trans.user: + log_in_url = url_for( controller="user", action="login", use_panels=True ) + log_in_link = "<a href='%s'>log in</a>" % ( log_in_url ) + register_url = url_for( controller="user", action="create", use_panels=True ) + register_link = "<a href='%s'>register</a>" % ( register_url ) + return trans.show_error_message( "You need to %s or %s to use multiple histories" + % ( log_in_link, register_link ), use_panels=True ) + #TODO: allow specifying user_id for admin? include_deleted_histories = galaxy.util.string_as_bool( include_deleted_histories ) order = order if order in ( 'update', 'name', 'size' ) else 'update' 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.