From 56bbb99da85ee4c0f1201be3efd42a53641207e0 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Wed, 3 Dec 2008 17:01:22 -0500 Subject: [PATCH] Filter out deleted roles on the Roles page. --- lib/galaxy/web/controllers/admin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/web/controllers/admin.py b/lib/galaxy/web/controllers/admin.py index 2ec08a52fe6..f65f1a2027c 100644 --- a/lib/galaxy/web/controllers/admin.py +++ b/lib/galaxy/web/controllers/admin.py @@ -43,9 +43,11 @@ class Admin( BaseController ): params = util.Params( kwd ) msg = params.msg messagetype = params.get( 'messagetype', 'done' ) + roles = trans.app.model.Role.filter( and_( trans.app.model.Role.table.c.deleted==False, + trans.app.model.Role.table.c.type != trans.app.model.Role.types.PRIVATE ) ) \ + .order_by( trans.app.model.Role.table.c.name ).all() return trans.fill_template( '/admin/dataset_security/roles.mako', - roles=trans.app.model.Role.filter( trans.app.model.Role.table.c.type != trans.app.model.Role.types.PRIVATE ) \ - .order_by( trans.app.model.Role.table.c.name ).all(), + roles=roles, msg=msg, messagetype=messagetype ) @web.expose