Repository: ambari Updated Branches: refs/heads/trunk 7c2c14d97 -> 2051d58a8
AMBARI-19294. Background Operations popup: no name for operations (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2051d58a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2051d58a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2051d58a Branch: refs/heads/trunk Commit: 2051d58a8e38b21f1b3e2ce49ca4475e22d89f9c Parents: 7c2c14d Author: Aleksandr Kovalenko <akovale...@hortonworks.com> Authored: Fri Dec 23 18:39:47 2016 +0200 Committer: Aleksandr Kovalenko <akovale...@hortonworks.com> Committed: Fri Dec 23 20:21:02 2016 +0200 ---------------------------------------------------------------------- .../controllers/global/background_operations_controller.js | 4 ++-- .../test/controllers/global/background_operations_test.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2051d58a/ambari-web/app/controllers/global/background_operations_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/background_operations_controller.js b/ambari-web/app/controllers/global/background_operations_controller.js index 3a011f5..d833661 100644 --- a/ambari-web/app/controllers/global/background_operations_controller.js +++ b/ambari-web/app/controllers/global/background_operations_controller.js @@ -329,10 +329,10 @@ App.BackgroundOperationsController = Em.Controller.extend({ if (requestContext.indexOf(App.BackgroundOperationsController.CommandContexts.PREFIX) !== -1) { context = this.getRequestContextWithPrefix(requestContext); } else { - context.parsedRequestContext = requestContext; + context.requestContext = requestContext; } } else { - context.parsedRequestContext = Em.I18n.t('requestInfo.unspecified'); + context.requestContext = Em.I18n.t('requestInfo.unspecified'); } return context; }, http://git-wip-us.apache.org/repos/asf/ambari/blob/2051d58a/ambari-web/test/controllers/global/background_operations_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/global/background_operations_test.js b/ambari-web/test/controllers/global/background_operations_test.js index 323f090..5517b1e 100644 --- a/ambari-web/test/controllers/global/background_operations_test.js +++ b/ambari-web/test/controllers/global/background_operations_test.js @@ -830,7 +830,7 @@ describe('App.BackgroundOperationsController', function () { beforeEach(function() { sinon.stub(controller, 'getRequestContextWithPrefix').returns({ - parsedRequestContext: 'CTX_WITH_PREFIX' + requestContext: 'CTX_WITH_PREFIX' }); }); @@ -840,19 +840,19 @@ describe('App.BackgroundOperationsController', function () { it("no requestContext specified", function() { expect(controller.parseRequestContext()).to.be.eql({ - parsedRequestContext: Em.I18n.t('requestInfo.unspecified') + requestContext: Em.I18n.t('requestInfo.unspecified') }); }); it("requestContext specified", function() { expect(controller.parseRequestContext('CTX')).to.be.eql({ - parsedRequestContext: 'CTX' + requestContext: 'CTX' }); }); it("requestContext specified with prefix", function() { expect(controller.parseRequestContext(App.BackgroundOperationsController.CommandContexts.PREFIX)).to.be.eql({ - parsedRequestContext: 'CTX_WITH_PREFIX' + requestContext: 'CTX_WITH_PREFIX' }); }); });
