You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/11/08 03:49:02 UTC
svn commit: r1406901 - in /incubator/ambari/branches/AMBARI-666:
AMBARI-666-CHANGES.txt ambari-web/app/controllers/wizard/step5_controller.js
Author: yusaku
Date: Thu Nov 8 02:49:01 2012
New Revision: 1406901
URL: http://svn.apache.org/viewvc?rev=1406901&view=rev
Log:
AMBARI-957. Adding a host whose hostname is the same as the one the user is accessing Ambari Web with breaks the Installer. (yusaku)
Modified:
incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js
Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1406901&r1=1406900&r2=1406901&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Thu Nov 8 02:49:01 2012
@@ -429,6 +429,9 @@ AMBARI-666 branch (unreleased changes)
BUG FIXES
+ AMBARI-957. Adding a host whose hostname is the same as the one the user
+ is accessing Ambari Web with breaks the Installer. (yusaku)
+
AMBARI-953. Fix navigation issues in installer wizard due to regression.
(Jaimin Jetly via yusaku)
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js?rev=1406901&r1=1406900&r2=1406901&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js Thu Nov 8 02:49:01 2012
@@ -287,7 +287,7 @@ App.WizardStep5Controller = Em.Controlle
inc++;
});
var hostExcAmbari = hostnames.without(location.hostname);
- if (hostExcAmbari !== null || hostExcAmbari !== undefined || hostExcAmbari.length !== 0) {
+ if (noOfHosts > 1) {
return hostExcAmbari[0];
} else {
return hostnames[0];
@@ -303,7 +303,7 @@ App.WizardStep5Controller = Em.Controlle
inc++;
});
var hostExcAmbari = hostnames.without(location.hostname);
- if (hostExcAmbari !== null || hostExcAmbari !== undefined || hostExcAmbari.length !== 0) {
+ if (noOfHosts > 1) {
return hostExcAmbari[0];
} else {
return hostnames[0];