Repository: ambari Updated Branches: refs/heads/branch-2.1 ff8a56af6 -> f559d1d50
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/f559d1d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f559d1d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f559d1d5 Branch: refs/heads/branch-2.1 Commit: f559d1d50665866ee6beae6c069ef2b0ed8c428c Parents: ff8a56a Author: Xi Wang <xiw...@apache.org> Authored: Mon Oct 12 15:36:09 2015 -0700 Committer: Xi Wang <xiw...@apache.org> Committed: Mon Oct 12 16:08:07 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/f559d1d5/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 d2e7e20..34cf80d 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/f559d1d5/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 ec807e2..21a1136 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); }
