Updated Branches: refs/heads/trunk 1b6281f2f -> dea1f811a
AMBARI-3093 Incorrect units of measure for "HBase Master Heap" widget on Dashboard. (atkach) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/dea1f811 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/dea1f811 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/dea1f811 Branch: refs/heads/trunk Commit: dea1f811a03fed5d5c873bd409777cfed7ddbbdb Parents: 1b6281f Author: atkach <[email protected]> Authored: Wed Sep 4 13:16:32 2013 +0300 Committer: atkach <[email protected]> Committed: Wed Sep 4 13:16:32 2013 +0300 ---------------------------------------------------------------------- .../app/views/main/dashboard/widgets/hbase_master_heap.js | 8 ++++++++ ambari-web/app/views/main/dashboard/widgets/namenode_heap.js | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dea1f811/ambari-web/app/views/main/dashboard/widgets/hbase_master_heap.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/hbase_master_heap.js b/ambari-web/app/views/main/dashboard/widgets/hbase_master_heap.js index e2c6dc3..aaeee2c 100644 --- a/ambari-web/app/views/main/dashboard/widgets/hbase_master_heap.js +++ b/ambari-web/app/views/main/dashboard/widgets/hbase_master_heap.js @@ -32,5 +32,13 @@ App.HBaseMasterHeapPieChartView = App.PieChartDashboardWidgetView.extend({ didInsertElement: function() { this._super(); this.calc(); + }, + + getUsed: function() { + return (this.get('model').get(this.get('modelFieldUsed')) / (1024 * 1024)) || 0; + }, + + getMax: function() { + return (this.get('model').get(this.get('modelFieldMax')) / (1024 * 1024)) || 0; } }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dea1f811/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js b/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js index 6d46d33..c9942ed 100644 --- a/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js +++ b/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js @@ -32,13 +32,5 @@ App.NameNodeHeapPieChartView = App.PieChartDashboardWidgetView.extend({ didInsertElement: function() { this._super(); this.calc(); - }, - - getUsed: function() { - return this.get('model').get(this.get('modelFieldUsed')) * 1024 * 1024 || 0; - }, - - getMax: function() { - return this.get('model').get(this.get('modelFieldMax')) * 1024 * 1024 || 0; } }); \ No newline at end of file
