AMBARI-8719 Repo distribution progress: task "Install Packages Actionexecute" should just say "Install Packages". (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a42be2cc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a42be2cc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a42be2cc Branch: refs/heads/trunk Commit: a42be2cc7f3978c6d09eab5b4be3622dae19db75 Parents: d45f386 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Tue Dec 16 16:30:00 2014 +0200 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Tue Dec 16 20:09:15 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + ambari-web/app/utils/helper.js | 3 +++ ambari-web/test/utils/helper_test.js | 4 ++++ 3 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a42be2cc/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 9dbcb75..5d6742b 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -221,6 +221,7 @@ Em.I18n.translations = { 'common.hostLog.popup.outputLog.value': 'output-{0}.txt', 'common.hostLog.popup.errorLog.value': 'errors-{0}.txt', 'common.maintenance.task': ' Toggle Maintenance Mode', + 'common.installRepo.task': ' Install Packages', 'common.used': 'used', 'common.free': 'free', 'common.type.string': 'string', http://git-wip-us.apache.org/repos/asf/ambari/blob/a42be2cc/ambari-web/app/utils/helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js index 7d182bf..899b9a0 100644 --- a/ambari-web/app/utils/helper.js +++ b/ambari-web/app/utils/helper.js @@ -485,6 +485,9 @@ App.format = { if (result === ' Nagios Update Ignore Actionexecute') { result = Em.I18n.t('common.maintenance.task'); } + if (result.indexOf('Install Packages Actionexecute') != -1) { + result = Em.I18n.t('common.installRepo.task'); + } if (result === ' Rebalancehdfs NameNode') { result = Em.I18n.t('services.service.actions.run.rebalanceHdfsNodes.title'); } http://git-wip-us.apache.org/repos/asf/ambari/blob/a42be2cc/ambari-web/test/utils/helper_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/helper_test.js b/ambari-web/test/utils/helper_test.js index 9274ae0..24852b3 100644 --- a/ambari-web/test/utils/helper_test.js +++ b/ambari-web/test/utils/helper_test.js @@ -179,6 +179,7 @@ describe('utils/helper', function() { var ignored = "DECOMMISSION, NAMENODE"; var removeString = "SERVICE/HDFS STOP"; var nagiosState = "nagios_update_ignore ACTIONEXECUTE"; + var installRepo = "install_packages ACTIONEXECUTE"; it('should convert command to readable info', function() { expect(App.format.commandDetail(command)).to.eql(' Ganglia Monitor Stop'); }); @@ -191,6 +192,9 @@ describe('utils/helper', function() { it('should return maintenance message', function() { expect(App.format.commandDetail(nagiosState)).to.eql(' Toggle Maintenance Mode'); }); + it('should return install repo message', function() { + expect(App.format.commandDetail(installRepo)).to.eql(Em.I18n.t('common.installRepo.task')); + }); }); describe('#taskStatus()', function(){ var testable = [
