AMBARI-14957 Paging not working properly when filtering with alerts and hostname. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f734aec9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f734aec9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f734aec9 Branch: refs/heads/branch-dev-patch-upgrade Commit: f734aec99bacb9ec6115574d890b74cc1d9477f5 Parents: 472d62a Author: Andrii Tkach <atk...@hortonworks.com> Authored: Mon Feb 8 16:54:55 2016 +0200 Committer: Andrii Tkach <atk...@hortonworks.com> Committed: Tue Feb 9 12:04:34 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/global/update_controller.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f734aec9/ambari-web/app/controllers/global/update_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js index 0168398..04e7427 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/ambari-web/app/controllers/global/update_controller.js @@ -118,6 +118,8 @@ App.UpdateController = Em.Controller.extend({ var params = ''; queryParams.forEach(function (param) { + var customKey = param.key; + switch (param.type) { case 'EQUAL': params += param.key + '=' + param.value; @@ -138,10 +140,10 @@ App.UpdateController = Em.Controller.extend({ params += 'sortBy=' + param.key + '.' + param.value; break; case 'CUSTOM': - param.value.forEach(function(item, index){ - param.key = param.key.replace('{' + index + '}', item); + param.value.forEach(function (item, index) { + customKey = customKey.replace('{' + index + '}', item); }, this); - params += param.key; + params += customKey; break; } params += '&';