ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject git commit: AMBARI-5087. If clicked on a separate window when on step 9 in the install wizard - it should resume. (Buzhor Denys via nechiporenko)
Date Fri, 14 Mar 2014 16:36:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ad28c4e4e -> 9432be826


AMBARI-5087. If clicked on a separate window when on step 9 in the install wizard - it should
resume. (Buzhor Denys via nechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9432be82
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9432be82
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9432be82

Branch: refs/heads/trunk
Commit: 9432be8263b85e367efde26d977ea76c59b8755f
Parents: ad28c4e
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Fri Mar 14 18:13:29 2014 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Fri Mar 14 18:36:28 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard.js                  |  3 ---
 ambari-web/app/controllers/wizard/step6_controller.js | 11 ++++++++++-
 ambari-web/app/routes/installer.js                    |  3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9432be82/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 28de25c..3365ca2 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -517,9 +517,6 @@ App.WizardController = Em.Controller.extend({
 
   loadServicesFromServer: function () {
     var services = this.getDBProperty('service');
-    if (services) {
-//      return;
-    }
     var apiService = this.loadServiceComponents();
     this.set('content.services', apiService);
     this.setDBProperty('service',apiService);

http://git-wip-us.apache.org/repos/asf/ambari/blob/9432be82/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js
index 2775500..c35cce7 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -35,7 +35,16 @@ var lazyloading = require('utils/lazy_loading');
 App.WizardStep6Controller = Em.Controller.extend({
 
   hosts: [],
-
+  /**
+   * List of components info about selecting/deselecting status for components.
+   *
+   * @type {Array}
+   *  @item {Em.Object}
+   *    @property name {String} - component name
+   *    @property label {String} - component display name
+   *    @property allChecked {Boolean} - all checkboxes are checked
+   *    @property noChecked {Boolean} - no checkboxes checked
+   */
   headers: [],
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/9432be82/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index df0056e..9408adb 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -56,7 +56,6 @@ module.exports = Em.Route.extend({
                 if (!installerController.get('isStep9')) {
                   installerController.setCurrentStep('9');
                 }
-                App.db.data = currentClusterStatus.localdb;
                 router.transitionTo('step' + installerController.get('currentStep'));
                 break;
               case 'CLUSTER_INSTALLED_4' :
@@ -437,4 +436,4 @@ module.exports = Em.Route.extend({
 
   gotoStep10: Em.Router.transitionTo('step10')
 
-});
\ No newline at end of file
+});


Mime
View raw message