Updated Branches: refs/heads/trunk 3fef9f457 -> 498113477
AMBARI-3610. Datanode and NodeManager Live widgets text style lost when the total number is 0. (xiwang) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/49811347 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/49811347 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/49811347 Branch: refs/heads/trunk Commit: 49811347712d9e4b9ba915e184399ad95f55da0c Parents: 3fef9f4 Author: Xi Wang <[email protected]> Authored: Wed Oct 30 15:31:37 2013 -0700 Committer: Xi Wang <[email protected]> Committed: Wed Oct 30 15:31:37 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/views/main/dashboard/widgets/datanode_live.js | 6 +++++- .../app/views/main/dashboard/widgets/node_managers_live.js | 6 +++++- .../app/views/main/dashboard/widgets/tasktracker_live.js | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49811347/ambari-web/app/views/main/dashboard/widgets/datanode_live.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/datanode_live.js b/ambari-web/app/views/main/dashboard/widgets/datanode_live.js index 98738df..3adab13 100644 --- a/ambari-web/app/views/main/dashboard/widgets/datanode_live.js +++ b/ambari-web/app/views/main/dashboard/widgets/datanode_live.js @@ -49,7 +49,11 @@ App.DataNodeUpView = App.TextDashboardWidgetView.extend({ }.property('model.hostComponents.@each'), data: function () { - return ((this.get('dataNodesLive').length / this.get('model.dataNodes.length')).toFixed(2)) * 100; + if ( !this.get('model.dataNodes.length')) { + return -1; + } else { + return ((this.get('dataNodesLive').length / this.get('model.dataNodes.length')).toFixed(2)) * 100; + } }.property('model.dataNodes.length', 'dataNodesLive'), content: function () { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49811347/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js b/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js index f8f726e..ef24cf7 100644 --- a/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js +++ b/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js @@ -49,7 +49,11 @@ App.NodeManagersLiveView = App.TextDashboardWidgetView.extend({ data: function () { var nodeManagers = this.get('model.nodeManagerNodes.length'); var nodeManagersLive = this.get('model.nodeManagerLiveNodes.length'); - return (nodeManagersLive / nodeManagers).toFixed(2) * 100; + if (!nodeManagers) { + return -1; + } else { + return (nodeManagersLive / nodeManagers).toFixed(2) * 100; + } }.property('model.nodeManagerNodes.length', 'model.nodeManagerLiveNodes.length'), content: function () { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49811347/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js b/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js index c64a6b4..7420340 100644 --- a/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js +++ b/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js @@ -44,7 +44,11 @@ App.TaskTrackerUpView = App.TextDashboardWidgetView.extend({ }.property('model.hostComponents.@each'), data: function () { - return (this.get('taskTrackersLive').length / this.get('model.taskTrackers.length')).toFixed(2) * 100; + if (!this.get('model.taskTrackers.length')) { + return -1; + } else { + return (this.get('taskTrackersLive').length / this.get('model.taskTrackers.length')).toFixed(2) * 100; + } }.property('model.taskTrackers.length', 'taskTrackersLive'), content: function () {
