From ddf58bc23a2894bac55f675352978e2488e9f55f Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 28 Jan 2022 19:20:52 +0100 Subject: [PATCH 1/3] manager: use .clickable-rows class (#59991) And deprecate .plaintable which is now useless. --- .../static/authentic2/manager/css/style.css | 4 --- src/authentic2/manager/tables.py | 28 +++++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/authentic2/manager/static/authentic2/manager/css/style.css b/src/authentic2/manager/static/authentic2/manager/css/style.css index 6793ab00..0935a635 100644 --- a/src/authentic2/manager/static/authentic2/manager/css/style.css +++ b/src/authentic2/manager/static/authentic2/manager/css/style.css @@ -270,10 +270,6 @@ span.activity { padding-right: 30px; } -table.main.plaintable tr:hover td { - cursor: default; -} - a.role-inheritance-view-all { font-style: italic; } diff --git a/src/authentic2/manager/tables.py b/src/authentic2/manager/tables.py index 0e919623..f625e6bf 100644 --- a/src/authentic2/manager/tables.py +++ b/src/authentic2/manager/tables.py @@ -77,7 +77,7 @@ class UserTable(Table): class Meta(Table.Meta): model = User - attrs = {'class': 'main', 'id': 'user-table'} + attrs = {'class': 'main clickable-rows', 'id': 'user-table'} fields = ('username', 'email', 'first_name', 'last_name', 'ou') sequence = ('link', '...') empty_text = _('None') @@ -150,12 +150,14 @@ class PermissionTable(Table): class OUTable(Table): - name = tables.Column(verbose_name=_('label')) + name = tables.LinkColumn( + viewname='a2-manager-ou-detail', kwargs={'pk': A('pk')}, accessor='name', verbose_name=_('label') + ) default = tables.BooleanColumn() class Meta(Table.Meta): model = OrganizationalUnit - attrs = {'class': 'main', 'id': 'ou-table'} + attrs = {'class': 'main clickable-rows', 'id': 'ou-table'} fields = ('name', 'slug', 'default') empty_text = _('None') @@ -190,7 +192,7 @@ class OuUserRolesTable(Table): class Meta(Table.Meta): model = Role - attrs = {'class': 'main plaintable', 'id': 'role-table'} + attrs = {'class': 'main', 'id': 'role-table'} fields = ('name', 'ou') empty_text = _('None') order_by = ('name',) @@ -216,31 +218,35 @@ class UserRolesTable(Table): class Meta(Table.Meta): model = Role - attrs = {'class': 'main', 'id': 'role-table'} + attrs = {'class': 'main clickable-rows', 'id': 'role-table'} fields = ('name', 'ou') empty_text = _('None') order_by = ('name', 'ou') class ServiceTable(Table): + name = tables.LinkColumn( + viewname='a2-manager-service', kwargs={'pk': A('pk')}, accessor='name', verbose_name=_('label') + ) ou = tables.Column() - name = tables.Column() slug = tables.Column() class Meta(Table.Meta): model = Service - attrs = {'class': 'main', 'id': 'service-table'} + attrs = {'class': 'main clickable-rows', 'id': 'service-table'} fields = ('ou', 'name', 'slug') empty_text = _('None') order_by = ('ou', 'name', 'slug') class ServiceRolesTable(Table): - name = tables.Column(accessor='name', verbose_name=_('name')) + name = tables.LinkColumn( + viewname='a2-manager-role-members', kwargs={'pk': A('pk')}, accessor='name', verbose_name=_('label') + ) class Meta(Table.Meta): model = Role - attrs = {'class': 'main', 'id': 'service-role-table'} + attrs = {'class': 'main clickable-rows', 'id': 'service-role-table'} fields = ('name',) empty_text = _('No access restriction. All users are allowed to connect to this service.') @@ -252,7 +258,7 @@ class UserAuthorizationsTable(Table): class Meta(Table.Meta): model = OIDCAuthorization - attrs = {'class': 'main plaintable', 'id': 'user-authorizations-table'} + attrs = {'class': 'main', 'id': 'user-authorizations-table'} fields = ('client', 'created', 'expired') empty_text = _('This user has not granted profile data access to any service yet.') @@ -274,6 +280,6 @@ class InheritanceRolesTable(Table): class Meta(Table.Meta): model = Role - attrs = {'class': 'main plaintable', 'id': 'inheritance-role-table'} + attrs = {'class': 'main', 'id': 'inheritance-role-table'} fields = ('name', 'ou') empty_text = _('None') -- 2.34.1