Author: yusaku
Date: Fri Jan 11 01:17:06 2013
New Revision: 1431777
URL: http://svn.apache.org/viewvc?rev=1431777&view=rev
Log:
AMBARI-1152. Add Hosts wizard - Retry button does not trigger call to backend.
(yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
incubator/ambari/trunk/ambari-web/app/routes/installer.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431777&r1=1431776&r2=1431777&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Jan 11 01:17:06 2013
@@ -671,6 +671,9 @@ AMBARI-666 branch (unreleased changes)
BUG FIXES
+ AMBARI-1152. Add Hosts wizard - Retry button does not trigger call to
+ backend. (yusaku)
+
AMBARI-1104. Webhcat configuration not setting templeton-libjars.
(Jaimin Jetly via yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard.js?rev=1431777&r1=1431776&r2=1431777&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard.js Fri Jan 11
01:17:06 2013
@@ -248,7 +248,9 @@ App.WizardController = Em.Controller.ext
return;
}
- this.set('content.cluster.requestId', null);
+ // clear requests since we are installing services
+ // and we don't want to get tasks for previous install attempts
+ this.set('content.cluster.oldRequestsId', []);
var self = this;
var clusterName = this.get('content.cluster.name');
Modified: incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js?rev=1431777&r1=1431776&r2=1431777&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js Fri Jan 11
01:17:06 2013
@@ -198,12 +198,11 @@ module.exports = Em.Route.extend({
retry: function(router,context) {
var addHostController = router.get('addHostController');
var wizardStep9Controller = router.get('wizardStep9Controller');
- if (!wizardStep9Controller.get('isSubmitDisabled')) {
- if (wizardStep9Controller.get('content.cluster.status') !== 'START
FAILED') {
- addHostController.installServices(true);
+ if (wizardStep9Controller.get('showRetry')) {
+ if (wizardStep9Controller.get('content.cluster.status') === 'INSTALL
FAILED') {
+ var isRetry = true;
+ addHostController.installServices(isRetry);
addHostController.setInfoForStep9();
- } else {
- wizardStep9Controller.set('content.cluster.isCompleted', false);
}
wizardStep9Controller.navigateStep();
}
Modified: incubator/ambari/trunk/ambari-web/app/routes/installer.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/installer.js?rev=1431777&r1=1431776&r2=1431777&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/installer.js Fri Jan 11
01:17:06 2013
@@ -281,7 +281,6 @@ module.exports = Em.Route.extend({
localdb: App.db.data
});
-
router.transitionTo('step9');
}
}),
