ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject git commit: AMBARI-5336. JobsDiagnostic|2.1.1: New jobs don't show up in jobs table. (alexantonenko)
Date Thu, 03 Apr 2014 21:43:32 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c98e67a7d -> 4ba9f1e81


AMBARI-5336. JobsDiagnostic|2.1.1: New jobs don't show up in jobs table. (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ba9f1e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ba9f1e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ba9f1e8

Branch: refs/heads/trunk
Commit: 4ba9f1e814ec4d58e9879df8b3ea125aca425e31
Parents: c98e67a
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri Apr 4 00:40:55 2014 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri Apr 4 00:40:55 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/jobs_controller.js | 6 +++---
 ambari-web/app/views/main/jobs_view.js             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4ba9f1e8/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 0fc185f..8233fc6 100644
--- a/ambari-web/app/controllers/main/jobs_controller.js
+++ b/ambari-web/app/controllers/main/jobs_controller.js
@@ -414,10 +414,10 @@ App.MainJobsController = Em.Controller.extend({
 
   initializePagination: function() {
     var back_link_IDs = this.get('navIDs.backIDs.[]');
-    if(!back_link_IDs.contains(App.HiveJob.find().objectAt(0).get('id'))) {
-      back_link_IDs.push(App.HiveJob.find().objectAt(0).get('id'));
+    if(!back_link_IDs.contains(this.get('lastJobID'))) {
+      back_link_IDs.push(this.get('lastJobID'));
     }
-    this.set('filterObject.backFromId', App.HiveJob.find().objectAt(0).get('id'));
+    this.set('filterObject.backFromId', this.get('lastJobID'));
     this.get('filterObject').set('fromTs', App.get('currentServerTime'));
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ba9f1e8/ambari-web/app/views/main/jobs_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/jobs_view.js b/ambari-web/app/views/main/jobs_view.js
index 7e42e0d..68436ab 100644
--- a/ambari-web/app/views/main/jobs_view.js
+++ b/ambari-web/app/views/main/jobs_view.js
@@ -171,7 +171,7 @@ App.MainJobsView = App.TableView.extend({
    * @returns {String}
    */
   filteredJobs: function () {
-    return Em.I18n.t('jobs.filtered.jobs').format(this.get('controller.content.length'),
this.get('controller.totalOfJobs'));
+    return Em.I18n.t('jobs.filtered.jobs').format(this.get('controller.content.length'),
this.get('controller.filterObject.jobsLimit'));
   }.property('controller.content.length', 'controller.totalOfJobs'),
 
   pageContentObserver: function () {


Mime
View raw message