From 73f6891a39888323912433a6bd3a0b614cf56ea1 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 11 Oct 2017 23:48:58 -0400 Subject: [PATCH 1/6] Add permissions operation to role grid --- lib/galaxy/webapps/galaxy/controllers/admin.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 34aedfa059c..7da5c63b779 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -222,6 +222,10 @@ class RoleListGrid(grids.Grid): condition=(lambda item: not item.deleted), allow_multiple=False, url_args=dict(action="form/rename_role")), + grids.GridOperation("Manage 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), From df8b933837b919b9fc09af9455d00b9b8a9689f8 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 11 Oct 2017 23:55:01 -0400 Subject: [PATCH 2/6] Revise labels --- lib/galaxy/webapps/galaxy/controllers/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 7da5c63b779..46ef1652152 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -218,11 +218,11 @@ 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("Manage Permissions", + 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")), From b211a5c6fd3bfa4428c7afca97870d4bd7d8820a Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 12 Oct 2017 00:04:49 -0400 Subject: [PATCH 3/6] Sort by last updated by default for roles --- lib/galaxy/webapps/galaxy/controllers/admin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 46ef1652152..87bbb249c2d 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -185,7 +185,7 @@ class RoleListGrid(grids.Grid): # Grid definition title = "Roles" model_class = model.Role - default_sort_key = "name" + default_sort_key = "-update_time" columns = [ NameColumn("Name", key="name", @@ -208,7 +208,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]], From 0a1b7dd433aae305aef579dad4ca45a6ced90879 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 12 Oct 2017 00:14:07 -0400 Subject: [PATCH 4/6] Add analog label and operation to groups grid --- lib/galaxy/webapps/galaxy/controllers/admin.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 87bbb249c2d..7a86b82ab6a 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -276,7 +276,7 @@ class GroupListGrid(grids.Grid): # Grid definition title = "Groups" model_class = model.Group - default_sort_key = "name" + default_sort_key = "-update_time" columns = [ NameColumn("Name", key="name", @@ -288,7 +288,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]], @@ -298,10 +299,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), From 7507a882571a06da8cc494b8158a361122977f09 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 12 Oct 2017 00:24:03 -0400 Subject: [PATCH 5/6] Add manage information to user operations --- lib/galaxy/webapps/galaxy/controllers/admin.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 7a86b82ab6a..be060c6e549 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, From e9856dec958a6dd67f41adc7b8b4271546671648 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 12 Oct 2017 13:53:44 -0400 Subject: [PATCH 6/6] Restore sorting by name --- lib/galaxy/webapps/galaxy/controllers/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index be060c6e549..d794ad25cd0 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -189,7 +189,7 @@ class RoleListGrid(grids.Grid): # Grid definition title = "Roles" model_class = model.Role - default_sort_key = "-update_time" + default_sort_key = "name" columns = [ NameColumn("Name", key="name", @@ -280,7 +280,7 @@ class GroupListGrid(grids.Grid): # Grid definition title = "Groups" model_class = model.Group - default_sort_key = "-update_time" + default_sort_key = "name" columns = [ NameColumn("Name", key="name",