You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/01/14 21:14:07 UTC
ambari git commit: AMBARI-9132. Rebalance HDFS doesn't work
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e19c46f0e -> daea86e2e
AMBARI-9132. Rebalance HDFS doesn't work (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/daea86e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/daea86e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/daea86e2
Branch: refs/heads/trunk
Commit: daea86e2e6c20f8d9a76e047f3ffbf63165a9334
Parents: e19c46f
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Jan 14 22:13:49 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Jan 14 22:13:49 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/item.js | 2 +-
ambari-web/app/views/main/service/item.js | 2 +-
ambari-web/package.json | 2 +-
ambari-web/test/views/main/service/item_test.js | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/daea86e2/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 119e834..3f5b880 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -378,7 +378,7 @@ App.MainServiceItemController = Em.Controller.extend({
this.hide();
},
bodyClass: Ember.View.extend({
- templateName: require('templates/common/prompt_popup'),
+ templateName: require('templates/common/modal_popups/prompt_popup'),
text: Em.I18n.t('services.service.actions.run.rebalanceHdfsNodes.prompt'),
didInsertElement: function () {
App.tooltip(this.$(".prompt-input"), {
http://git-wip-us.apache.org/repos/asf/ambari/blob/daea86e2/ambari-web/app/views/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js
index 2edd40d..7d307cc 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -132,7 +132,7 @@ App.MainServiceItemView = Em.View.extend({
action: this.get('controller.isSeveralClients') ? '' : 'downloadClientConfigs',
label: Em.I18n.t('services.service.actions.downloadClientConfigs'),
cssClass: 'icon-download-alt',
- isHidden: this.get('controller.content.clientComponents').rejectProperty('totalCount', 0).length == 0,
+ isHidden: !!this.get('controller.content.clientComponents') ? this.get('controller.content.clientComponents').rejectProperty('totalCount', 0).length == 0 : false,
disabled: false,
hasSubmenu: this.get('controller.isSeveralClients'),
submenuOptions: this.get('controller.clientComponents')
http://git-wip-us.apache.org/repos/asf/ambari/blob/daea86e2/ambari-web/package.json
----------------------------------------------------------------------
diff --git a/ambari-web/package.json b/ambari-web/package.json
index 3d632eb..7bdaddc 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
@@ -20,7 +20,7 @@
"devDependencies": {
"phantomjs": "^1.9.2",
"mocha":"1.9.0",
- "mocha-phantomjs": "^3.1.6",
+ "mocha-phantomjs": "~3.1.6",
"chai":"~1.9.0",
"sinon":"=1.7.3",
"sinon-chai":"~2.5.0",
http://git-wip-us.apache.org/repos/asf/ambari/blob/daea86e2/ambari-web/test/views/main/service/item_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/service/item_test.js b/ambari-web/test/views/main/service/item_test.js
index 4838358..ef133db 100644
--- a/ambari-web/test/views/main/service/item_test.js
+++ b/ambari-web/test/views/main/service/item_test.js
@@ -417,7 +417,8 @@ describe('App.MainServiceItemView', function () {
serviceTypes: testCase.serviceTypes,
passiveState: 'OFF'
}),
- isSeveralClients: false
+ isSeveralClients: false,
+ clientComponents: []
}),
mastersExcludedCommands: mastersExcludedCommands,
hasConfigTab: hasConfigTab