Selaa lähdekoodia

AMBARI-9347 Kerberos Wizard: provide option to "Complete" in wizard. (ababiichuk)

aBabiichuk 10 vuotta sitten
vanhempi
commit
7458ff2269

+ 6 - 2
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')
 });

+ 1 - 0
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',

+ 2 - 0
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