You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/10/13 01:07:40 UTC
ambari git commit: AMBARI-13394. Save checkpoint window does not
appear for hosts operations.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 259ee9807 -> 98d677395
AMBARI-13394. Save checkpoint window does not appear for hosts operations.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98d67739
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98d67739
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98d67739
Branch: refs/heads/trunk
Commit: 98d677395c319a65b349c00b6c98cca04402ff64
Parents: 259ee98
Author: Xi Wang <xi...@apache.org>
Authored: Mon Oct 12 15:36:09 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Mon Oct 12 16:07:05 2015 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/details.js | 4 ++--
ambari-web/app/controllers/main/service/item.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d67739/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index ac2ba6e..c68f35b 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -186,7 +186,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
miscController.loadUsers();
var interval = setInterval(function () {
if (miscController.get('dataIsLoaded') && miscController.get('users')) {
- self.set('content.hdfsUser', miscController.get('users').findProperty('name', 'hdfs_user').get('value'));
+ self.set('hdfsUser', miscController.get('users').findProperty('name', 'hdfs_user').get('value'));
dfd.resolve();
clearInterval(interval);
}
@@ -209,7 +209,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
self.getHdfsUser().done(function() {
var msg = Em.Object.create({
confirmMsg: Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointTooOld').format(App.nnCheckpointAgeAlertThreshold) +
- Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointTooOld.instructions').format(isNNCheckpointTooOld, self.get('content.hdfsUser')),
+ Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointTooOld.instructions').format(isNNCheckpointTooOld, self.get('hdfsUser')),
confirmButton: Em.I18n.t('common.next')
});
return App.showConfirmationFeedBackPopup(callback, msg);
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d67739/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 223e610..fa98a46 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -202,7 +202,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
self.getHdfsUser().done(function() {
var msg = Em.Object.create({
confirmMsg: Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointTooOld').format(App.nnCheckpointAgeAlertThreshold) +
- Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointTooOld.instructions').format(isNNCheckpointTooOld, self.get('content.hdfsUser')),
+ Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointTooOld.instructions').format(isNNCheckpointTooOld, self.get('hdfsUser')),
confirmButton: Em.I18n.t('common.next')
});
return App.showConfirmationFeedBackPopup(callback, msg);
@@ -282,7 +282,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
miscController.loadUsers();
var interval = setInterval(function () {
if (miscController.get('dataIsLoaded') && miscController.get('users')) {
- self.set('content.hdfsUser', miscController.get('users').findProperty('name', 'hdfs_user').get('value'));
+ self.set('hdfsUser', miscController.get('users').findProperty('name', 'hdfs_user').get('value'));
dfd.resolve();
clearInterval(interval);
}