ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-11276. All properties were added to config group per site.xml on Install Wizard. (onechiporenko)
Date Wed, 20 May 2015 17:51:51 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c4d452900 -> d1e4b6b01


AMBARI-11276. All properties were added to config group per site.xml on Install Wizard. (onechiporenko)


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

Branch: refs/heads/trunk
Commit: d1e4b6b0125022a8a7f382d1cd007a9d8f0aec7e
Parents: c4d4529
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Wed May 20 20:48:44 2015 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Wed May 20 20:48:44 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js | 2 --
 ambari-web/app/controllers/wizard/step8_controller.js   | 2 +-
 ambari-web/test/controllers/wizard/step8_test.js        | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d1e4b6b0/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index dd6e437..b6cb26a 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -372,7 +372,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
    * @method onConfigGroupChange
    */
   onConfigGroupChange: function () {
-    console.time('!!!!!!!!!');
     var self = this;
     this.get('stepConfigs').clear();
     var selectedConfigGroup = this.get('selectedConfigGroup');
@@ -421,7 +420,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
         } else {
           self.onLoadOverrides(self.get('allConfigs'));
         }
-        console.timeEnd('!!!!!!!!!');
       });
     });
   }.observes('selectedConfigGroup'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1e4b6b0/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 81f2a8c..0e1b777 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1553,7 +1553,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs,
App.wiz
     });
 
     return sites.map(function (site) {
-      return this.createSiteObj(site.type, site.tag, site.properties);
+      return App.router.get('mainServiceInfoConfigsController').createSiteObj(site.type,
site.tag, site.properties);
     }, this);
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1e4b6b0/ambari-web/test/controllers/wizard/step8_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js
index 67631a6..d65c145 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -329,7 +329,8 @@ describe('App.WizardStep8Controller', function () {
         },
         getConfigAttributes: function() {
           return Em.A(['atr']);
-        }
+        },
+        createSiteObj: App.MainServiceInfoConfigsController.create({}).createSiteObj.bind(App.MainServiceInfoConfigsController.create({}))
       }));
     });
     afterEach(function() {


Mime
View raw message