You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2012/05/26 21:20:31 UTC
svn commit: r1342945 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/js/addNodes.js
Author: vgogate
Date: Sat May 26 19:20:30 2012
New Revision: 1342945
URL: http://svn.apache.org/viewvc?rev=1342945&view=rev
Log:
AMBARI-293: Invoking browser back action on any step after the Add Hosts step in the Cluster Init Wizard launches the host discovery process again by Yusaku sako
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/js/addNodes.js
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1342945&r1=1342944&r2=1342945&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Sat May 26 19:20:30 2012
@@ -6,6 +6,10 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-293. Invoking browser "back" action on any step after the Add
+ Hosts step in the Cluster Init Wizard launches the host
+ discovery process again (Yusaku Sako via vgogate)
+
AMBARI-289. Hive dependency on hcat (jitendra via vgogate)
AMBARI-288. Add description for Nagios config (vgogate)
Modified: incubator/ambari/branches/ambari-186/hmc/js/addNodes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/addNodes.js?rev=1342945&r1=1342944&r2=1342945&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/addNodes.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/addNodes.js Sat May 26 19:20:30 2012
@@ -156,6 +156,7 @@ globalYui.one('#addNodesSubmitButtonId')
addNodesFilesForm.set('target', 'fileUploadTarget');
/* And then programmatically submit the first of the 2 forms. */
+ doPostUpload = true;
addNodesFilesForm.submit();
globalYui.log("Files submitted to server.");
@@ -163,11 +164,17 @@ globalYui.one('#addNodesSubmitButtonId')
});
var setupNodesJson = "";
+var doPostUpload = false; // this flag is to prevent the #fileUploadTargetId iframe onload event from being invoked on browser back action
globalYui.one("#fileUploadTargetId").on('load', function (e) {
+ if (!doPostUpload) {
+ return;
+ }
globalYui.log("File upload finished");
+ doPostUpload = false;
+
var repoFile = '';
var artifactsUrl = '';
var gplArtifactsUrl = '';
@@ -196,6 +203,7 @@ globalYui.one("#fileUploadTargetId").on(
timeout : 10000,
on: {
success: function (x,o) {
+
globalYui.log("RAW JSON DATA: " + o.responseText);
// Process the JSON data returned from the server
try {