]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #34142 from rhcs-dashboard/wip-44667-fix-reload-issues
authorLenz Grimmer <lgrimmer@suse.com>
Fri, 24 Apr 2020 13:58:17 +0000 (15:58 +0200)
committerGitHub <noreply@github.com>
Fri, 24 Apr 2020 13:58:17 +0000 (15:58 +0200)
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
1  2 
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts

index bf28689d35d92a8c2850d84166bbfb3f678de82b,8573c7395570d38eff8597a2b4c7bd46a81c06a5..1a99482b5bbe5f0a0b9fec97d5405398cbdf6b33
@@@ -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 = [
        {
index 6aae6d17ed65a6af9ff528b072c8ee43699e80db,8775220401b63f10acfc455015c008e5a721cb43..b920ecd7d30fdbe3d434d00c7d27aa113715408b
@@@ -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[] = [];
      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 = [
        {