From: Lenz Grimmer <lgrimmer@suse.com>
Date: Fri, 24 Apr 2020 13:58:17 +0000 (+0200)
Subject: Merge pull request #34142 from rhcs-dashboard/wip-44667-fix-reload-issues
X-Git-Tag: v16.1.0~2515
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88cb9f7adc02a147940dab6c2886ada24d5cf330;p=ceph.git

Merge pull request #34142 from rhcs-dashboard/wip-44667-fix-reload-issues

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

88cb9f7adc02a147940dab6c2886ada24d5cf330
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
index bf28689d35d9,8573c7395570..1a99482b5bbe
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
@@@ -42,9 -43,9 +44,10 @@@ export class RgwBucketListComponent ext
      private bsModalService: BsModalService,
      private i18n: I18n,
      private urlBuilder: URLBuilderService,
-     public actionLabels: ActionLabelsI18n
+     public actionLabels: ActionLabelsI18n,
+     private ngZone: NgZone
    ) {
 +    super();
      this.permission = this.authStorageService.getPermissions().rgw;
      this.columns = [
        {
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts
index 6aae6d17ed65,8775220401b6..b920ecd7d30f
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts
@@@ -27,10 -26,9 +27,9 @@@ const BASE_URL = 'rgw/user'
    styleUrls: ['./rgw-user-list.component.scss'],
    providers: [{ provide: URLBuilderService, useValue: new URLBuilderService(BASE_URL) }]
  })
 -export class RgwUserListComponent {
 +export class RgwUserListComponent extends ListWithDetails {
    @ViewChild(TableComponent, { static: true })
    table: TableComponent;
- 
    permission: Permission;
    tableActions: CdTableAction[];
    columns: CdTableColumn[] = [];
@@@ -43,9 -43,9 +44,10 @@@
      private bsModalService: BsModalService,
      private i18n: I18n,
      private urlBuilder: URLBuilderService,
-     public actionLabels: ActionLabelsI18n
+     public actionLabels: ActionLabelsI18n,
+     private ngZone: NgZone
    ) {
 +    super();
      this.permission = this.authStorageService.getPermissions().rgw;
      this.columns = [
        {