update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / shared / directives / form-input-disable.directive.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.ts
index 4fcfe65e0dcd53bfd8476edee20ca96ace663a1d..3e3f83bc56e3f6e63fd81e3793111080ae92b677 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.ts
@@ -6,11 +6,10 @@ import { FormScopeDirective } from './form-scope.directive';
 
 @Directive({
   selector:
-    'input:not([cdNoFormInputDisable]), select:not([cdNoFormInputDisable]), [cdFormInputDisable]'
+    'input:not([cdNoFormInputDisable]), select:not([cdNoFormInputDisable]), button:not([cdNoFormInputDisable]), [cdFormInputDisable]'
 })
 export class FormInputDisableDirective implements AfterViewInit {
   permissions: Permissions;
-  service_name: keyof Permissions;
 
   constructor(
     @Optional() private formScope: FormScopeDirective,
@@ -20,10 +19,8 @@ export class FormInputDisableDirective implements AfterViewInit {
 
   ngAfterViewInit() {
     this.permissions = this.authStorageService.getPermissions();
-    if (this.formScope !== null) {
-      this.service_name = this.formScope.cdFormScope;
-    }
-    if (this.service_name && !this.permissions[this.service_name].update) {
+    const service_name = this.formScope?.cdFormScope;
+    if (service_name && !this.permissions?.[service_name]?.update) {
       this.elementRef.nativeElement.disabled = true;
     }
   }