diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 34aedfa059c..d794ad25cd0 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -121,6 +121,10 @@ class UserListGrid(grids.Grid): grids.GridAction("Create new user", url_args=dict(webapp="galaxy", action="create_new_user")) ] operations = [ + grids.GridOperation("Manage Information", + condition=(lambda item: not item.deleted), + allow_multiple=False, + url_args=dict(controller="user", action="information", webapp="galaxy")), grids.GridOperation("Manage Roles and Groups", condition=(lambda item: not item.deleted), allow_multiple=False, @@ -208,7 +212,8 @@ class RoleListGrid(grids.Grid): UsersColumn("Users", attach_popup=False), StatusColumn("Status", attach_popup=False), # Columns that are valid for filtering but are not visible. - grids.DeletedColumn("Deleted", key="deleted", visible=False, filterable="advanced") + grids.DeletedColumn("Deleted", key="deleted", visible=False, filterable="advanced"), + grids.GridColumn("Last Updated", key="update_time", format=time_ago) ] columns.append(grids.MulticolFilterColumn("Search", cols_to_filter=[columns[0], columns[1], columns[2]], @@ -218,10 +223,14 @@ class RoleListGrid(grids.Grid): global_actions = [ grids.GridAction("Add new role", url_args=dict(action="form/create_role")) ] - operations = [grids.GridOperation("Edit", + operations = [grids.GridOperation("Edit Name/Description", condition=(lambda item: not item.deleted), allow_multiple=False, url_args=dict(action="form/rename_role")), + grids.GridOperation("Edit Permissions", + condition=(lambda item: not item.deleted), + allow_multiple=False, + url_args=dict(action="form/manage_users_and_groups_for_role", webapp="galaxy")), grids.GridOperation("Delete", condition=(lambda item: not item.deleted), allow_multiple=True), @@ -283,7 +292,8 @@ class GroupListGrid(grids.Grid): RolesColumn("Roles", attach_popup=False), StatusColumn("Status", attach_popup=False), # Columns that are valid for filtering but are not visible. - grids.DeletedColumn("Deleted", key="deleted", visible=False, filterable="advanced") + grids.DeletedColumn("Deleted", key="deleted", visible=False, filterable="advanced"), + grids.GridColumn("Last Updated", key="update_time", format=time_ago) ] columns.append(grids.MulticolFilterColumn("Search", cols_to_filter=[columns[0]], @@ -293,10 +303,14 @@ class GroupListGrid(grids.Grid): global_actions = [ grids.GridAction("Add new group", url_args=dict(action="form/create_group")) ] - operations = [grids.GridOperation("Rename", + operations = [grids.GridOperation("Edit Name", condition=(lambda item: not item.deleted), allow_multiple=False, url_args=dict(action="form/rename_group")), + grids.GridOperation("Edit Permissions", + condition=(lambda item: not item.deleted), + allow_multiple=False, + url_args=dict(action="form/manage_users_and_roles_for_group", webapp="galaxy")), grids.GridOperation("Delete", condition=(lambda item: not item.deleted), allow_multiple=True),