You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/08/04 15:52:51 UTC
ambari git commit: AMBARI-12631 Load current version and all versions
info in parallel requests to reduce service config page loading
time(additional patch). (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 db1c23ac3 -> 6e6919baa
AMBARI-12631 Load current version and all versions info in parallel requests to reduce service config page loading time(additional patch). (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e6919ba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e6919ba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e6919ba
Branch: refs/heads/branch-2.1
Commit: 6e6919baa24d214ae8e340580fd4e6bbebcdade6
Parents: db1c23a
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Aug 4 16:47:46 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Aug 4 16:47:46 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 2 +-
ambari-web/test/controllers/main/service/info/config_test.js | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e6919ba/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 6ff285e..43512c2 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -295,8 +295,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
*/
loadStep: function () {
var serviceName = this.get('content.serviceName');
- this.set('dependentServiceNames', App.StackService.find(serviceName).get('dependentServiceNames'));
this.clearStep();
+ this.set('dependentServiceNames', App.StackService.find(serviceName).get('dependentServiceNames'));
if (App.get('isClusterSupportsEnhancedConfigs')) {
this.loadConfigTheme(serviceName).always(function() {
App.themesMapper.generateAdvancedTabs([serviceName]);
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e6919ba/ambari-web/test/controllers/main/service/info/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js
index 6fd8e98..cccefa8 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -787,6 +787,7 @@ describe("App.MainServiceInfoConfigsController", function () {
describe('#bodyClass', function () {
beforeEach(function() {
+ sinon.stub(App.StackService, 'find').returns([{dependentServiceNames: []}]);
sinon.stub(App.ajax, 'send', Em.K);
// default implementation
bodyView = mainServiceInfoConfigsController.showSaveConfigsPopup().get('bodyClass').create({
@@ -796,6 +797,7 @@ describe("App.MainServiceInfoConfigsController", function () {
afterEach(function() {
App.ajax.send.restore();
+ App.StackService.find.restore();
});
describe('#componentsFilterSuccessCallback', function () {