You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/04/22 16:55:41 UTC
[1/2] git commit: AMBARI-5522. Jobs table is rendered incorrectly
when there are no jobs available (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 5dd1ded5d -> ca6e4de6d
AMBARI-5522. Jobs table is rendered incorrectly when there are no jobs available (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86da4e6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86da4e6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86da4e6a
Branch: refs/heads/trunk
Commit: 86da4e6a8d5e3a7700fdff63f106cedb2d96b4df
Parents: 5dd1ded
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Apr 22 17:42:53 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Apr 22 17:42:53 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/jobs_controller.js | 5 ++++-
ambari-web/app/templates/main/jobs.hbs | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/86da4e6a/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 a458efa..790a668 100644
--- a/ambari-web/app/controllers/main/jobs_controller.js
+++ b/ambari-web/app/controllers/main/jobs_controller.js
@@ -359,7 +359,10 @@ App.MainJobsController = Em.Controller.extend({
{ name: Em.I18n.t('jobs.column.start.time'), index: 2 },
{ name: Em.I18n.t('jobs.column.end.time'), index: 3 },
{ name: Em.I18n.t('jobs.column.duration'), index: 4 }
- ]
+ ],
+ columnsCount: function () {
+ return this.get('content.length') + 1;
+ }.property('content.length')
}),
lastIDSuccessCallback: function(data, jqXHR, textStatus) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/86da4e6a/ambari-web/app/templates/main/jobs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/jobs.hbs b/ambari-web/app/templates/main/jobs.hbs
index c4e7fe6..03e9137 100644
--- a/ambari-web/app/templates/main/jobs.hbs
+++ b/ambari-web/app/templates/main/jobs.hbs
@@ -52,7 +52,7 @@
<tbody>
{{#if view.noDataToShow}}
<tr>
- <td class="no-data" {{bindAttr colspan="controller.columnsName.content.length"}}>
+ <td class="no-data" {{bindAttr colspan="controller.columnsName.columnsCount"}}>
{{#if controller.loaded}}
{{t jobs.nothingToShow}}
{{else}}
[2/2] git commit: AMBARI-5523. Jobs controller not critical js error
when "No jobs to display" (alexantonenko)
Posted by al...@apache.org.
AMBARI-5523. Jobs controller not critical js error when "No jobs to display" (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ca6e4de6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ca6e4de6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ca6e4de6
Branch: refs/heads/trunk
Commit: ca6e4de6d66ff9fc92c04424bb4878eebe6dfe1f
Parents: 86da4e6
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Apr 22 17:49:20 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Apr 22 17:49:20 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/jobs_controller.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ca6e4de6/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 790a668..fd94f5e 100644
--- a/ambari-web/app/controllers/main/jobs_controller.js
+++ b/ambari-web/app/controllers/main/jobs_controller.js
@@ -366,6 +366,9 @@ App.MainJobsController = Em.Controller.extend({
}),
lastIDSuccessCallback: function(data, jqXHR, textStatus) {
+ if(!data.entities[0]){
+ return;
+ }
var lastReceivedID = data.entities[0].entity;
if(this.get('lastJobID') == '') {
this.set('lastJobID', lastReceivedID);