opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for editing role name, descriptionn, and renaming groups. Resolves issue #539.

Browse Source
This commit is contained in:
Greg Von Kuster
2011-06-01 15:47:04 -04:00
parent 72dfb35375
commit 95ffc3243f
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/base/controller.py
+31 -25
View File
@@ -1278,20 +1278,23 @@ class Admin( object ):
if not new_name:
message = 'Enter a valid name'
status='error'
elif trans.sa_session.query( trans.app.model.Role ).filter( trans.app.model.Role.table.c.name==new_name ).first():
message = 'A role with that name already exists'
status = 'error'
else:
role.name = new_name
role.description = new_description
trans.sa_session.add( role )
trans.sa_session.flush()
message = "Role '%s' has been renamed to '%s'" % ( old_name, new_name )
return trans.response.send_redirect( web.url_for( controller='admin',
action='roles',
webapp=webapp,
message=util.sanitize_text( message ),
status='done' ) )
existing_role = trans.sa_session.query( trans.app.model.Role ).filter( trans.app.model.Role.table.c.name==new_name ).first()
if existing_role and existing_role.id != role.id:
message = 'A role with that name already exists'
status = 'error'
else:
if not ( role.name == new_name and role.description == new_description ):
role.name = new_name
role.description = new_description
trans.sa_session.add( role )
trans.sa_session.flush()
message = "Role '%s' has been renamed to '%s'" % ( old_name, new_name )
return trans.response.send_redirect( web.url_for( controller='admin',
action='roles',
webapp=webapp,
message=util.sanitize_text( message ),
status='done' ) )
return trans.fill_template( '/admin/dataset_security/role/role_rename.mako',
role=role,
webapp=webapp,
@@ -1556,19 +1559,22 @@ class Admin( object ):
if not new_name:
message = 'Enter a valid name'
status = 'error'
elif trans.sa_session.query( trans.app.model.Group ).filter( trans.app.model.Group.table.c.name==new_name ).first():
message = 'A group with that name already exists'
status = 'error'
else:
group.name = new_name
trans.sa_session.add( group )
trans.sa_session.flush()
message = "Group '%s' has been renamed to '%s'" % ( old_name, new_name )
return trans.response.send_redirect( web.url_for( controller='admin',
action='groups',
webapp=webapp,
message=util.sanitize_text( message ),
status='done' ) )
existing_group = trans.sa_session.query( trans.app.model.Group ).filter( trans.app.model.Group.table.c.name==new_name ).first()
if existing_group and existing_group.id != group.id:
message = 'A group with that name already exists'
status = 'error'
else:
if group.name != new_name:
group.name = new_name
trans.sa_session.add( group )
trans.sa_session.flush()
message = "Group '%s' has been renamed to '%s'" % ( old_name, new_name )
return trans.response.send_redirect( web.url_for( controller='admin',
action='groups',
webapp=webapp,
message=util.sanitize_text( message ),
status='done' ) )
return trans.fill_template( '/admin/dataset_security/group/group_rename.mako',
group=group,
webapp=webapp,
lib/galaxy/web/controllers/admin.py
+1 -1
View File
@@ -169,7 +169,7 @@ class RoleListGrid( grids.Grid ):
global_actions = [
grids.GridAction( "Add new role", dict( controller='admin', action='roles', operation='create' ) )
]
operations = [ grids.GridOperation( "Rename",
operations = [ grids.GridOperation( "Edit",
condition=( lambda item: not item.deleted ),
allow_multiple=False,
url_args=dict( webapp="galaxy", action="rename_role" ) ),