You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/01/27 12:15:58 UTC
[2/2] ambari git commit: AMBARI-9347 Kerberos Wizard: provide option
to "Complete" in wizard. (ababiichuk)
AMBARI-9347 Kerberos Wizard: provide option to "Complete" in wizard. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7458ff22
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7458ff22
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7458ff22
Branch: refs/heads/trunk
Commit: 7458ff226911a6987a397ce1bbe97b64768e4f70
Parents: e44e73e
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Jan 27 11:20:03 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Jan 27 11:20:03 2015 +0200
----------------------------------------------------------------------
.../app/controllers/main/admin/kerberos/step7_controller.js | 8 ++++++--
ambari-web/app/messages.js | 1 +
ambari-web/app/views/main/admin/kerberos/step7_view.js | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7458ff22/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
index 2cde092..af39815 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
@@ -17,7 +17,7 @@
*/
App.KerberosWizardStep7Controller = App.KerberosProgressPageController.extend({
- name: 'kerberosWizardStep6Controller',
+ name: 'kerberosWizardStep7Controller',
clusterDeployState: 'KERBEROS_DEPLOY',
commands: ['startServices'],
@@ -35,5 +35,9 @@ App.KerberosWizardStep7Controller = App.KerberosProgressPageController.extend({
success: 'startPolling',
error: 'onTaskError'
});
- }
+ },
+
+ isSubmitDisabled: function () {
+ return !["COMPLETED", "FAILED"].contains(this.get('status'));
+ }.property('status')
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/7458ff22/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index aa98f01..5a2a38d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1014,6 +1014,7 @@ Em.I18n.translations = {
'admin.kerberos.wizard.step6.notice.completed': 'Kerberos has successfully been enabled on the cluster.',
'admin.kerberos.wizard.step7.notice.inProgress': 'Please wait while services are being started and tested.',
'admin.kerberos.wizard.step7.notice.completed': 'Services have been successfully tested with kerberos environment.',
+ 'admin.kerberos.wizard.step7.notice.failed': 'Some services failed to start and execute tests successfully. Click Retry to attempt again or click Complete to dismiss the wizard and fix manually.',
'admin.kerberos.wizard.step7.task0.title' : 'Start and Test Services',
'admin.highAvailability':' High Availability',
http://git-wip-us.apache.org/repos/asf/ambari/blob/7458ff22/ambari-web/app/views/main/admin/kerberos/step7_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/kerberos/step7_view.js b/ambari-web/app/views/main/admin/kerberos/step7_view.js
index 42426ea..e26cca2 100644
--- a/ambari-web/app/views/main/admin/kerberos/step7_view.js
+++ b/ambari-web/app/views/main/admin/kerberos/step7_view.js
@@ -23,6 +23,8 @@ App.KerberosWizardStep7View = App.KerberosProgressPageView.extend({
noticeCompleted: Em.I18n.t('admin.kerberos.wizard.step7.notice.completed'),
+ noticeFailed: Em.I18n.t('admin.kerberos.wizard.step7.notice.failed'),
+
submitButtonText: Em.I18n.t('common.complete'),
showBackButton: false