From 95ffc3243f4cff5d4e28781e82e4bc437efee163 Mon Sep 17 00:00:00 2001
From: Greg Von Kuster <greg@bx.psu.edu>
Date: Wed, 1 Jun 2011 15:47:04 -0400
Subject: [PATCH] Fixes for editing role name, descriptionn, and renaming
 groups.  Resolves issue #539.

---
 lib/galaxy/web/base/controller.py   | 56 ++++++++++++++++-------------
 lib/galaxy/web/controllers/admin.py |  2 +-
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/lib/galaxy/web/base/controller.py b/lib/galaxy/web/base/controller.py
index 1c9773dd0a4..186b07cbd46 100644
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -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,
diff --git a/lib/galaxy/web/controllers/admin.py b/lib/galaxy/web/controllers/admin.py
index b2297cf668b..83944b3abec 100644
--- a/lib/galaxy/web/controllers/admin.py
+++ b/lib/galaxy/web/controllers/admin.py
@@ -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" ) ),