details: http://www.bx.psu.edu/hg/galaxy/rev/9666acdf74f4 changeset: 3170:9666acdf74f4 user: jeremy goecks <jeremy.goecks@emory.edu> date: Thu Dec 10 14:37:22 2009 -0500 description: Bug fixes for grid: remove ampersand from 'manage groups and users' operation in admin grid and heed allow_popup flag. diffstat: lib/galaxy/web/controllers/admin.py | 4 ++-- templates/grid_base.mako | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diffs (48 lines): diff -r 2ef0b3ed06f3 -r 9666acdf74f4 lib/galaxy/web/controllers/admin.py --- a/lib/galaxy/web/controllers/admin.py Thu Dec 10 10:56:01 2009 -0500 +++ b/lib/galaxy/web/controllers/admin.py Thu Dec 10 14:37:22 2009 -0500 @@ -91,7 +91,7 @@ grids.GridAction( "Create new user", dict( controller='admin', action='users', operation='create' ) ) ] operations = [ - grids.GridOperation( "Manage Roles & Groups", condition=( lambda item: not item.deleted ), allow_multiple=False ), + grids.GridOperation( "Manage Roles and Groups", condition=( lambda item: not item.deleted ), allow_multiple=False ), grids.GridOperation( "Reset Password", condition=( lambda item: not item.deleted ), allow_multiple=True, allow_popup=False ) ] #TODO: enhance to account for trans.app.config.allow_user_deletion here so that we can eliminate these operations if @@ -942,7 +942,7 @@ return self.create_new_user( trans, **kwargs ) if operation == "information": return self.user_info( trans, **kwargs ) - if operation == "manage roles & groups": + if operation == "manage roles and groups": return self.user( trans, **kwargs ) # Render the list view return self.user_list_grid( trans, **kwargs ) diff -r 2ef0b3ed06f3 -r 9666acdf74f4 templates/grid_base.mako --- a/templates/grid_base.mako Thu Dec 10 10:56:01 2009 -0500 +++ b/templates/grid_base.mako Thu Dec 10 14:37:22 2009 -0500 @@ -556,12 +556,12 @@ { if (href_parms[index].indexOf('operation') != -1) { - // Found operation parm; get operation value. + // Found operation parm; get operation value. operation = href_parms[index].split('=')[1]; } else if (href_parms[index].indexOf('id') != -1) { - // Found operation parm; get operation value. + // Found id parm; get id value. id = href_parms[index].split('=')[1]; } } @@ -868,7 +868,7 @@ <td> <div popupmenu="grid-${i}-popup"> %for operation in grid.operations: - %if operation.allowed( item ): + %if operation.allowed( item ) and operation.allow_popup: <% target = "" if operation.target: