incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1406460 - in /incubator/ambari/branches/AMBARI-666: ./ ambari-web/app/controllers/ ambari-web/app/controllers/wizard/ ambari-web/app/routes/ ambari-web/app/views/wizard/
Date Wed, 07 Nov 2012 04:38:56 GMT
Author: yusaku
Date: Wed Nov  7 04:38:56 2012
New Revision: 1406460

URL: http://svn.apache.org/viewvc?rev=1406460&view=rev
Log:
AMBARI-953. Fix navigation issues in installer wizard introduced due to regression. (Jaimin
Jetly via yusaku)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step1_controller.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.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=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Wed Nov  7 04:38:56 2012
@@ -407,6 +407,9 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-953. Fix navigation issues in installer wizard due to regression.
+  (Jaimin Jetly via yusaku)
+
   AMBARI-899. Use slf4j-api 1.5.5 rather than 1.6.6. (yusaku)
 
   AMBARI-902. Fix ZooKeeper badge allocation logic for single host and 

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js Wed Nov 
7 04:38:56 2012
@@ -425,14 +425,16 @@ App.InstallerController = Em.Controller.
   clearHosts: function () {
     var hosts = this.get('content').get('hosts');
     if (hosts) {
-      hosts.hostNames = '';
-      hosts.manualInstall = false;
-      hosts.localRepo = '';
-      hosts.localRepopath = '';
-      hosts.sshKey = '';
-      hosts.passphrase = '';
-      hosts.confirmPassphrase = '';
+      hosts.set('hostNames', '');
+      hosts.set('manualInstall', false);
+      hosts.set('localRepo', '');
+      hosts.set('localRepopath', '');
+      hosts.set('sshKey', '');
+      hosts.set('passphrase', '');
+      hosts.set('confirmPassphrase', '');
     }
+    App.db.setHosts(null);
+    App.db.setAllHostNames(null);
   },
 
   /**
@@ -591,12 +593,19 @@ App.InstallerController = Em.Controller.
    */
   loadSlaveComponentHosts: function () {
     var slaveComponentHosts = App.db.getSlaveComponentHosts();
-    this.set("content.slaveComponentHosts", slaveComponentHosts);
-    console.log("InstallerController.loadSlaveComponentHosts: loaded hosts ", slaveComponentHosts);
-
+    if (slaveComponentHosts !== undefined) {
+      this.set("content.slaveComponentHosts", slaveComponentHosts);
+      console.log("InstallerController.loadSlaveComponentHosts: loaded hosts ", slaveComponentHosts);
+    } else {
+      this.set("content.slaveComponentHosts", null);
+    }
     var hostSlaveComponents = App.db.getHostSlaveComponents();
-    this.set('content.hostSlaveComponents', hostSlaveComponents);
-    console.log("InstallerController.loadSlaveComponentHosts: loaded hosts ", hostSlaveComponents);
+    if (hostSlaveComponents !== undefined) {
+      this.set('content.hostSlaveComponents', hostSlaveComponents);
+      console.log("InstallerController.loadSlaveComponentHosts: loaded hosts ", hostSlaveComponents);
+    } else {
+      this.set("content.hostSlaveComponents", null);
+    }
   },
 
   /**
@@ -682,10 +691,9 @@ App.InstallerController = Em.Controller.
       case '7':
         this.loadServiceConfigProperties();
       case '6':
-        this.loadClients();
+        this.loadSlaveComponentHosts();
       case '5':
         this.loadMasterComponentHosts();
-        this.loadSlaveComponentHosts();
         this.loadHostToMasterComponent();
         this.loadConfirmedHosts();
       case '4':

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step1_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step1_controller.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step1_controller.js
(original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step1_controller.js
Wed Nov  7 04:38:56 2012
@@ -34,6 +34,7 @@ App.WizardStep1Controller = Em.Controlle
 
   loadStep: function () {
     var clusterName;
+    this.set('hasSubmitted',false);
     console.log('The value of the cluster name is: ' + App.db.getClusterName());
     if (App.db.getClusterName() !== undefined) {
       this.set('clusterName', App.db.getClusterName());

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js
(original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js
Wed Nov  7 04:38:56 2012
@@ -75,7 +75,7 @@ App.WizardStep6Controller = Em.Controlle
    */
   isHbSelected: function () {
     return this.get('content.services').findProperty('serviceName', 'HBASE').get('isSelected');
-  }.property('content'),
+  }.property('content.services'),
 
   /**
    * Return whether MapReduce service was selected or not.
@@ -84,7 +84,7 @@ App.WizardStep6Controller = Em.Controlle
    */
 	isMrSelected: function () {
     return this.get('content.services').findProperty('serviceName', 'MAPREDUCE').get('isSelected');
-	}.property('content'),
+	}.property('content.services'),
 
   clearError: function () {
     if (this.get('isNoDataNodes') === false &&

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js
(original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js
Wed Nov  7 04:38:56 2012
@@ -105,13 +105,6 @@ App.WizardStep9Controller = Em.Controlle
   replacePolledData: function (polledData) {
     this.polledData.clear;
     this.set('polledData', polledData);
-    console.log('*******/ In replace PolledData function **********/');
-    console.log("The value of polleddata is: " + polledData);
-    console.log("2.The value of polleddata is: " + this.get('polledData'));
-    this.get('polledData').forEach(function (_data) {
-      console.log('The name of the host is: ' + _data.Tasks.host_name);
-      console.log('The status of the task is: ' + _data.Tasks.status);
-    }, this);
   },
 
   displayMessage: function (task) {
@@ -550,7 +543,6 @@ App.WizardStep9Controller = Em.Controlle
     this.hosts.clear();
     var hostInfo = this.mockHostData;
     this.renderHosts(hostInfo);
-
   },
 
   pollBtn: function () {

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js Wed Nov  7 04:38:56
2012
@@ -72,6 +72,7 @@ module.exports = Em.Route.extend({
       var installerController = router.get('installerController');
       var wizardStep1Controller = router.get('wizardStep1Controller');
       installerController.saveClusterInfo(wizardStep1Controller);
+      installerController.clearHosts();
       router.transitionTo('step2');
     }
   }),
@@ -183,6 +184,7 @@ module.exports = Em.Route.extend({
       var wizardStep5Controller = router.get('wizardStep5Controller');
       controller.saveMasterComponentHosts(wizardStep5Controller);
       App.db.setSlaveComponentHosts(undefined);
+      App.db.setHostSlaveComponents(undefined);
       router.transitionTo('step6');
     }
   }),
@@ -241,7 +243,7 @@ module.exports = Em.Route.extend({
     next: function (router) {
       var installerController = router.get('installerController');
       var wizardStep8Controller = router.get('wizardStep8Controller');
-      installerController.installServices();   //TODO: Uncomment for the actual hookup
+        installerController.installServices();   //TODO: Uncomment for the actual hookupq
       installerController.setInfoForStep9();
       router.transitionTo('step9');
     }
@@ -257,7 +259,7 @@ module.exports = Em.Route.extend({
       controller.connectOutlet('wizardStep9', controller.get('content'));
     },
     back: Em.Router.transitionTo('step8'),
-    retry: function(router,context) {
+    retry: function (router, context) {
       var installerController = router.get('installerController');
       var wizardStep9Controller = router.get('wizardStep9Controller');
       installerController.installServices();

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js Wed
Nov  7 04:38:56 2012
@@ -246,7 +246,7 @@ App.ServiceConfigMultipleHostsDisplay = 
     console.log('view', this.get('viewName')); //to know which View cause errors
     console.log('controller', this.get('controller').name); //should be slaveComponentGroupsController
     if(!this.get('value')){
-      debugger;
+     // debugger;
     }
     return this.get('value').length === 0;
   }.property('value'),

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js Wed Nov
 7 04:38:56 2012
@@ -27,8 +27,7 @@ App.WizardStep2View = Em.View.extend({
   didInsertElement: function () {
     $("[rel=popover]").popover({'placement': 'right', 'trigger': 'hover'});
     this.set('hostNameErr', false);
-    this.set('controller.passphraseMatchErr', false);
-    this.set('controller.sshKeyNullErr', false);
+    //this.set('controller.sshKeyNullErr', false);
   },
 
 

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js?rev=1406460&r1=1406459&r2=1406460&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js Wed Nov
 7 04:38:56 2012
@@ -141,7 +141,7 @@ App.HostStatusView = Em.View.extend({
               tasks.filterProperty('Tasks.role', _role).forEach(function (_task) {
                 var statusObj = {};
                 statusObj.status = _task.Tasks.command;
-                statusObj.url = _task.Tasks.href;
+                statusObj.url = _task.href;
                 statusArr.pushObject(statusObj);
               }, this);
               roleObj.statusArr = statusArr;
@@ -151,15 +151,6 @@ App.HostStatusView = Em.View.extend({
           return roleArr;
         }.property('tasks.@each'),
 
-        logState: function () {
-          var taskObj = {};
-          var tasks = this.get('tasks');
-          if (tasks) {
-            var taskarr = tasks.mapProperty('Tasks.command').uniq();
-
-          }
-        }.property('tasks.@each.Tasks.command'),
-
         didInsertElement: function () {
           console.log('The value of event context is: ' + host.name);
           this.set('tasks', self.get('controller').getCompletedTasksForHost(event.context));



Mime
View raw message