You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by is...@apache.org on 2018/06/28 22:12:47 UTC
[ambari] branch trunk updated: [AMBARI-24210] Provide Button to Download CSV of Keytabs From Kerbero… (#1643)
This is an automated email from the ASF dual-hosted git repository.
ishanbha 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 5919d5d [AMBARI-24210] Provide Button to Download CSV of Keytabs From Kerbero… (#1643)
5919d5d is described below
commit 5919d5d7de287a2b0ea1fa3b4a64c759d6f9b7a8
Author: Ishan Bhatt <is...@gmail.com>
AuthorDate: Thu Jun 28 15:12:45 2018 -0700
[AMBARI-24210] Provide Button to Download CSV of Keytabs From Kerbero… (#1643)
* [AMBARI-24210] Provide Button to Download CSV of Keytabs From Kerberos Section in the UI.
* Added spacing between Regenerate keytab icon and text
---
ambari-web/app/controllers/main/admin/kerberos.js | 9 ++++
ambari-web/app/templates/main/admin/kerberos.hbs | 56 +++++++++++++----------
2 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js
index c559398..ea0eca5 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -655,6 +655,15 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({
}).always(function() {
self.set('isRecommendedLoaded', true);
});
+ },
+
+ showDownloadCsv: function () {
+ var hasUpgradePrivilege = App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK');
+ return hasUpgradePrivilege;
+ }.property(),
+
+ downloadCSV: function() {
+ App.router.get('kerberosWizardStep5Controller').getCSVData(false);
}
});
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs b/ambari-web/app/templates/main/admin/kerberos.hbs
index 0a0b330..e74a90c 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -18,24 +18,34 @@
{{#if dataIsLoaded}}
{{#if securityEnabled}}
<div>
- <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-success" id="regenerate-keytabs" {{bindAttr disabled="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>
- {{/if}}
- {{/unless}}
- <br/>
- <button href="#" {{action makeConfigsEditable target="controller"}}
- {{bindAttr class="controller.isEditMode:hidden :btn :btn-default :pull-right"}}>
- {{t common.edit}}
- </button>
+ <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-success"
+ id="regenerate-keytabs" {{bindAttr disabled="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>
{{/if}}
- {{/isAuthorized}}
+ {{/unless}}
+ {{/if}}
+ {{/isAuthorized}}
+ {{#if showDownloadCsv}}
+ <button class="btn btn-success"}} {{action downloadCSV target="controller"}}>
+ <i class="glyphicon glyphicon-download-alt"></i> {{t admin.kerberos.wizard.step5.downloadCSV}}
+ </button>
+ {{/if}}
+ <br/>
+ {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
+ {{#if App.supports.enableToggleKerberos}}
+ <button href="#" {{action makeConfigsEditable target="controller"}}
+ {{bindAttr class="controller.isEditMode:hidden :btn :btn-default :pull-right"}}>
+ {{t common.edit}}
+ </button>
+ {{/if}}
+ {{/isAuthorized}}
</div>
<div id="serviceConfig">
{{view App.ServicesConfigView}}
@@ -50,12 +60,12 @@
{{else}}
<div>
<p class="muted background-text">{{t admin.security.disabled}}
- {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
- {{#if App.supports.enableToggleKerberos}}
- <a class="btn btn-padding btn-success admin-enable-security-btn" {{action checkAndStartKerberosWizard target="controller"}}>{{t admin.kerberos.button.enable}} </a>
- <br/>
- {{/if}}
- {{/isAuthorized}}
+ {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
+ {{#if App.supports.enableToggleKerberos}}
+ <a class="btn btn-padding btn-success admin-enable-security-btn" {{action checkAndStartKerberosWizard target="controller"}}>{{t admin.kerberos.button.enable}} </a>
+ <br/>
+ {{/if}}
+ {{/isAuthorized}}
</p>
</div>
{{/if}}