]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Proper format iSCSI target portals 37060/head
authorVolker Theile <vtheile@suse.com>
Wed, 12 Aug 2020 10:54:07 +0000 (12:54 +0200)
committerLaura Paduano <lpaduano@suse.com>
Fri, 2 Oct 2020 09:56:43 +0000 (11:56 +0200)
Proper format the 'Portals' and 'Images' columns.

Fixes: https://tracker.ceph.com/issues/46908
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit ac0b34a26777400226e263120e4b82644b2e0d51)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts
- Resolved import conflicts; Replaced JoinPipe with ListPipe since JoinPipe is
  not available in nautilus

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts

index 6710b755457af45035dc7829097e4a8388b560c8..ddfc38ca69fed367c7d11eb32a15bc6788e3a03f 100644 (file)
@@ -16,6 +16,7 @@ import { CdTableSelection } from '../../../shared/models/cd-table-selection';
 import { FinishedTask } from '../../../shared/models/finished-task';
 import { Permissions } from '../../../shared/models/permissions';
 import { CephReleaseNamePipe } from '../../../shared/pipes/ceph-release-name.pipe';
+import { ListPipe } from '../../../shared/pipes/list.pipe';
 import { NotAvailablePipe } from '../../../shared/pipes/not-available.pipe';
 import { AuthStorageService } from '../../../shared/services/auth-storage.service';
 import { SummaryService } from '../../../shared/services/summary.service';
@@ -58,6 +59,7 @@ export class IscsiTargetListComponent implements OnInit, OnDestroy {
     private authStorageService: AuthStorageService,
     private i18n: I18n,
     private iscsiService: IscsiService,
+    private listPipe: ListPipe,
     private taskListService: TaskListService,
     private cephReleaseNamePipe: CephReleaseNamePipe,
     private notAvailablePipe: NotAvailablePipe,
@@ -105,11 +107,13 @@ export class IscsiTargetListComponent implements OnInit, OnDestroy {
       {
         name: this.i18n('Portals'),
         prop: 'cdPortals',
+        pipe: this.listPipe,
         flexGrow: 2
       },
       {
         name: this.i18n('Images'),
         prop: 'cdImages',
+        pipe: this.listPipe,
         flexGrow: 2
       },
       {