Repository: ambari Updated Branches: refs/heads/trunk 194f1a179 -> 6dcbb8733
AMBARI-5221. When coming on jobs page first time, jobs first request is requesting all queries without limit. (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6dcbb873 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6dcbb873 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6dcbb873 Branch: refs/heads/trunk Commit: 6dcbb87333a4364b3d2a3b776bf22981faf826ad Parents: 194f1a1 Author: Alex Antonenko <hiv...@gmail.com> Authored: Wed Mar 26 15:28:55 2014 +0200 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Wed Mar 26 15:28:55 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/jobs_controller.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6dcbb873/ambari-web/app/controllers/main/jobs_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/jobs_controller.js b/ambari-web/app/controllers/main/jobs_controller.js index 454210b..62a5122 100644 --- a/ambari-web/app/controllers/main/jobs_controller.js +++ b/ambari-web/app/controllers/main/jobs_controller.js @@ -121,7 +121,7 @@ App.MainJobsController = Em.Controller.extend({ filterObject: Ember.Object.create({ id: "", isIdFilterApplied: false, - jobsLimit: -1, + jobsLimit: 10, user: "", windowStart: "", windowEnd: "", @@ -289,9 +289,9 @@ App.MainJobsController = Em.Controller.extend({ if(this.get("id") !== "") { link = "/" + this.get("id") + link; } - if(this.get("jobsLimit") != -1){ - link += "&limit=" + this.get("jobsLimit"); - } + + link += "&limit=" + this.get("jobsLimit"); + if(this.get("user") !== ""){ link += "&primaryFilter=user:" + this.get("user"); }
