From: Volker Theile Date: Thu, 25 Jun 2020 15:03:51 +0000 (+0200) Subject: mgr/dashboard: Display check icon instead of true|false in various datatables X-Git-Tag: v16.1.0~1887^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35779%2Fhead;p=ceph.git mgr/dashboard: Display check icon instead of true|false in various datatables - Convert the boolean values true|false to a check icon in datatable columns. - Remove unused code in the user management list. Fixes: https://tracker.ceph.com/issues/46209 Signed-off-by: Volker Theile --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts index 1a48903510c1..658dea3b4598 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts @@ -116,7 +116,9 @@ export class InventoryDevicesComponent implements OnInit, OnDestroy { { name: this.i18n('Available'), prop: 'available', - flexGrow: 1 + flexGrow: 1, + cellClass: 'text-center', + cellTransformation: CellTemplate.checkIcon }, { name: this.i18n('Vendor'), diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts index 2eb5afbae514..4f23794f2446 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts @@ -73,7 +73,9 @@ export class ServicesComponent extends ListWithDetails implements OnChanges, OnI { name: this.i18n('Running'), prop: 'status.running', - flexGrow: 1 + flexGrow: 1, + cellClass: 'text-center', + cellTransformation: CellTemplate.checkIcon }, { name: this.i18n('Size'), diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.html index 7ba6a5ade502..89ed21be8331 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.html @@ -20,8 +20,3 @@ {{ role }}{{ !isLast ? ", " : "" }} - - - {{ value | booleanText }} - diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts index 9f2a6207f070..470167e77b24 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts @@ -30,8 +30,6 @@ const BASE_URL = 'user-management/users'; export class UserListComponent implements OnInit { @ViewChild('userRolesTpl', { static: true }) userRolesTpl: TemplateRef; - @ViewChild('userEnabledTpl', { static: true }) - userEnabledTpl: TemplateRef; permission: Permission; tableActions: CdTableAction[];