2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/31b4f3ee40d6/ Changeset: 31b4f3ee40d6 Branch: next-stable User: greg Date: 2014-01-27 21:01:49 Summary: Fix for multi-set email alerts for repository changes in the tool shed. Affected #: 3 files diff -r 79d9ae1d84826e5bfa1c3b3ddf57112927f9a7fb -r 31b4f3ee40d638fd7bd47951e443dec59a99a193 lib/galaxy/webapps/tool_shed/controllers/repository.py --- a/lib/galaxy/webapps/tool_shed/controllers/repository.py +++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py @@ -2466,6 +2466,10 @@ kwd[ 'message' ] = 'You must be logged in to set email alerts.' kwd[ 'status' ] = 'error' del kwd[ 'operation' ] + elif operation == "view_or_manage_repository": + return trans.response.send_redirect( web.url_for( controller='repository', + action='view_or_manage_repository', + **kwd ) ) self.email_alerts_repository_grid.title = "Set email alerts for repository changes" return self.email_alerts_repository_grid( trans, **kwd ) @@ -2766,9 +2770,8 @@ @web.expose @web.require_login( "set email alerts" ) def set_email_alerts( self, trans, **kwd ): - # Set email alerts for selected repositories - # This method is called from multiple grids, so - # the caller must be passed. + """Set email alerts for selected repositories.""" + # This method is called from multiple grids, so the caller must be passed. caller = kwd[ 'caller' ] user = trans.user if user: diff -r 79d9ae1d84826e5bfa1c3b3ddf57112927f9a7fb -r 31b4f3ee40d638fd7bd47951e443dec59a99a193 lib/tool_shed/grids/repository_grids.py --- a/lib/tool_shed/grids/repository_grids.py +++ b/lib/tool_shed/grids/repository_grids.py @@ -304,7 +304,7 @@ visible=False, filterable="advanced" ) ] - operations = [] + operations = [ grids.GridOperation( "Receive email alerts", allow_multiple=True ) ] global_actions = [ grids.GridAction( "User preferences", dict( controller='user', action='index', cntrller='repository' ) ) ] diff -r 79d9ae1d84826e5bfa1c3b3ddf57112927f9a7fb -r 31b4f3ee40d638fd7bd47951e443dec59a99a193 templates/webapps/tool_shed/user/manage_email_alerts.mako --- a/templates/webapps/tool_shed/user/manage_email_alerts.mako +++ b/templates/webapps/tool_shed/user/manage_email_alerts.mako @@ -4,7 +4,7 @@ <br/><br/><ul class="manage-table-actions"><li> - <a class="action-button" href="${h.url_for( controller='repository', action='multi_select_email_alerts', cntrller='repository' )}">Manage repository alerts</a> + <a class="action-button" href="${h.url_for( controller='repository', action='multi_select_email_alerts' )}">Manage repository alerts</a></li><li><a class="action-button" href="${h.url_for( controller='user', action='index', cntrller='repository' )}">User preferences</a> https://bitbucket.org/galaxy/galaxy-central/commits/8d90711f302d/ Changeset: 8d90711f302d User: greg Date: 2014-01-27 21:02:20 Summary: Merged from next-stable Affected #: 3 files diff -r 15f845aa98d2fbec19039eb879e481468fbd4cca -r 8d90711f302d9b51a8fc506461143128f516411a lib/galaxy/webapps/tool_shed/controllers/repository.py --- a/lib/galaxy/webapps/tool_shed/controllers/repository.py +++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py @@ -2466,6 +2466,10 @@ kwd[ 'message' ] = 'You must be logged in to set email alerts.' kwd[ 'status' ] = 'error' del kwd[ 'operation' ] + elif operation == "view_or_manage_repository": + return trans.response.send_redirect( web.url_for( controller='repository', + action='view_or_manage_repository', + **kwd ) ) self.email_alerts_repository_grid.title = "Set email alerts for repository changes" return self.email_alerts_repository_grid( trans, **kwd ) @@ -2766,9 +2770,8 @@ @web.expose @web.require_login( "set email alerts" ) def set_email_alerts( self, trans, **kwd ): - # Set email alerts for selected repositories - # This method is called from multiple grids, so - # the caller must be passed. + """Set email alerts for selected repositories.""" + # This method is called from multiple grids, so the caller must be passed. caller = kwd[ 'caller' ] user = trans.user if user: diff -r 15f845aa98d2fbec19039eb879e481468fbd4cca -r 8d90711f302d9b51a8fc506461143128f516411a lib/tool_shed/grids/repository_grids.py --- a/lib/tool_shed/grids/repository_grids.py +++ b/lib/tool_shed/grids/repository_grids.py @@ -304,7 +304,7 @@ visible=False, filterable="advanced" ) ] - operations = [] + operations = [ grids.GridOperation( "Receive email alerts", allow_multiple=True ) ] global_actions = [ grids.GridAction( "User preferences", dict( controller='user', action='index', cntrller='repository' ) ) ] diff -r 15f845aa98d2fbec19039eb879e481468fbd4cca -r 8d90711f302d9b51a8fc506461143128f516411a templates/webapps/tool_shed/user/manage_email_alerts.mako --- a/templates/webapps/tool_shed/user/manage_email_alerts.mako +++ b/templates/webapps/tool_shed/user/manage_email_alerts.mako @@ -4,7 +4,7 @@ <br/><br/><ul class="manage-table-actions"><li> - <a class="action-button" href="${h.url_for( controller='repository', action='multi_select_email_alerts', cntrller='repository' )}">Manage repository alerts</a> + <a class="action-button" href="${h.url_for( controller='repository', action='multi_select_email_alerts' )}">Manage repository alerts</a></li><li><a class="action-button" href="${h.url_for( controller='user', action='index', cntrller='repository' )}">User preferences</a> 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.