Author: yusaku
Date: Fri Jun 7 18:17:19 2013
New Revision: 1490766
URL: http://svn.apache.org/r1490766
Log:
AMBARI-2321. Host Checks warning should force a popup when the user tries to
move on without viewing it first. (Oleg Nechiporenko via yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
incubator/ambari/trunk/ambari-web/app/messages.js
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1490766&r1=1490765&r2=1490766&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
Fri Jun 7 18:17:19 2013
@@ -522,8 +522,19 @@ App.WizardStep3Controller = Em.Controlle
submit: function () {
if (!this.get('isSubmitDisabled')) {
- this.set('content.hosts', this.get('bootHosts'));
- App.router.send('next');
+ if(this.get('isHostHaveWarnings')) {
+ var self = this;
+ App.showConfirmationPopup(
+ function(){
+ self.set('content.hosts', self.get('bootHosts'));
+ App.router.send('next');
+ },
+
Em.I18n.t('installer.step3.hostWarningsPopup.hostHasWarnings'));
+ }
+ else {
+ this.set('content.hosts', this.get('bootHosts'));
+ App.router.send('next');
+ }
}
},
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1490766&r1=1490765&r2=1490766&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Fri Jun 7 18:17:19 2013
@@ -319,6 +319,7 @@ Em.I18n.translations = {
'installer.step3.hostWarningsPopup.runningOnOneHost':'WARN: running on 1
host',
'installer.step3.hostWarningsPopup.runningOnManyHost':'WARN: running on {0}
hosts',
'installer.step3.hostWarningsPopup.rerunChecks':'Rerun Checks',
+ 'installer.step3.hostWarningsPopup.hostHasWarnings':'Warning: Host checks
failed on some of your hosts. It is highly recommended that you fix these
problems first before proceeding to prevent potentially major problems with
cluster installation. Are you sure you want to ignore these warnings and
proceed?',
'installer.step3.warningsWindow.allHosts':'Warnings across all hosts',
'installer.step3.warningsWindow.warningsOn':'Warnings on ',
'installer.step3.warningsWindow.directoriesAndFiles':'DIRECTORIES AND FILES',
