This is an automated email from the ASF dual-hosted git repository. wuzhiguo pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 790cb72a3d AMBARI-25187: Kerberos operations are shown in service action dropdown when not needed (#3440) 790cb72a3d is described below commit 790cb72a3d083f2d612fdbea6a958f46c2e02d30 Author: Zhiguo Wu <wuzhi...@apache.org> AuthorDate: Thu Oct 27 14:38:02 2022 +0800 AMBARI-25187: Kerberos operations are shown in service action dropdown when not needed (#3440) --- ambari-web/app/models/host_component.js | 2 +- ambari-web/app/templates/main/admin/kerberos.hbs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ambari-web/app/models/host_component.js b/ambari-web/app/models/host_component.js index 0f666026e9..aa7646c57e 100644 --- a/ambari-web/app/models/host_component.js +++ b/ambari-web/app/models/host_component.js @@ -391,7 +391,7 @@ App.HostComponentActionMap = { action: 'regenerateKeytabFileOperations', label: Em.I18n.t('admin.kerberos.button.regenerateKeytabs'), cssClass: 'glyphicon glyphicon-repeat', - isHidden: !App.get('isKerberosEnabled') + isHidden: !App.get('isKerberosEnabled') || Em.computed.bool('App.router.mainAdminKerberosController.isManualKerberos') }, REFRESHQUEUES: { action: 'refreshYarnQueues', diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs b/ambari-web/app/templates/main/admin/kerberos.hbs index e74a90cd26..1552c639b5 100644 --- a/ambari-web/app/templates/main/admin/kerberos.hbs +++ b/ambari-web/app/templates/main/admin/kerberos.hbs @@ -21,10 +21,10 @@ <span class="text-success">{{t admin.security.enabled}}</span> {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}} {{#if App.supports.enableToggleKerberos}} - <button class="btn btn-padding btn-warning admin-disable-security-btn" {{bindAttr disabled="isKerberosButtonsDisabled"}} {{action notifySecurityOffPopup target="controller"}}>{{t admin.kerberos.button.disable}} </button> - {{#unless isManualKerberos}} + <button class="btn btn-padding btn-warning admin-disable-security-btn" {{bindAttr disabled="controller.isKerberosButtonsDisabled"}} {{action notifySecurityOffPopup target="controller"}}>{{t admin.kerberos.button.disable}} </button> + {{#unless controller.isManualKerberos}} <button class="btn btn-success" - id="regenerate-keytabs" {{bindAttr disabled="isKerberosButtonsDisabled"}} {{action regenerateKeytabs target="controller"}}> + id="regenerate-keytabs" {{bindAttr disabled="controller.isKerberosButtonsDisabled"}} {{action regenerateKeytabs target="controller"}}> <i class="glyphicon glyphicon-repeat"></i> {{t admin.kerberos.button.regenerateKeytabs}}</button> {{#if App.isCredentialStorePersistent}} <button class="btn btn-primary" {{action showManageKDCCredentialsPopup target="controller"}}>{{t admin.kerberos.credentials.store.menu.label}}</button> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org For additional commands, e-mail: commits-h...@ambari.apache.org