commit/galaxy-central: greg: Slight fix for viewing invalid tools - allow an admin user to view only his invalid tools if requesting from the repositories view.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/b11be06de890/ changeset: b11be06de890 user: greg date: 2012-04-04 19:56:22 summary: Slight fix for viewing invalid tools - allow an admin user to view only his invalid tools if requesting from the repositories view. affected #: 3 files diff -r e514944f0a38e6d88307251958b4407e5d20e51b -r b11be06de890f3ecb457e435726cd8e6ad9b6c63 lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -405,9 +405,10 @@ message = util.restore_text( params.get( 'message', '' ) ) status = params.get( 'status', 'done' ) webapp = params.get( 'webapp', 'community' ) + cntrller = params.get( 'cntrller', 'repository' ) is_admin = trans.user_is_admin() invalid_tools_dict = odict() - if is_admin: + if is_admin and cntrller == 'admin': for repository in trans.sa_session.query( trans.model.Repository ) \ .filter( trans.model.Repository.table.c.deleted == False ) \ .order_by( trans.model.Repository.table.c.name ): diff -r e514944f0a38e6d88307251958b4407e5d20e51b -r b11be06de890f3ecb457e435726cd8e6ad9b6c63 templates/webapps/community/admin/index.mako --- a/templates/webapps/community/admin/index.mako +++ b/templates/webapps/community/admin/index.mako @@ -61,7 +61,7 @@ <a target="galaxy_main" href="${h.url_for( controller='admin', action='browse_repository_metadata', webapp='community' )}">Browse metadata</a></div><div class="toolTitle"> - <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_invalid_tools', webapp='community' )}">Browse invalid tools</a> + <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_invalid_tools', cntrller='admin', webapp='community' )}">Browse invalid tools</a></div></div></div> diff -r e514944f0a38e6d88307251958b4407e5d20e51b -r b11be06de890f3ecb457e435726cd8e6ad9b6c63 templates/webapps/community/index.mako --- a/templates/webapps/community/index.mako +++ b/templates/webapps/community/index.mako @@ -72,7 +72,7 @@ <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_repositories', operation='my_repositories', webapp='community' )}">Browse my repositories</a></div><div class="toolTitle"> - <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_invalid_tools', webapp='community' )}">Browse my invalid tools</a> + <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_invalid_tools', cntrller='repository', webapp='community' )}">Browse my invalid tools</a></div> %endif </div> 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.
participants (1)
-
Bitbucket