From da6cfd461c6b0fe08f7f4efced9d5c2080dc2b4a Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 7 Mar 2012 09:40:56 +0100 Subject: [PATCH] correctly display openvz memory on status page --- www/manager/openvz/StatusView.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/www/manager/openvz/StatusView.js b/www/manager/openvz/StatusView.js index 41832fc7..3a5029ff 100644 --- a/www/manager/openvz/StatusView.js +++ b/www/manager/openvz/StatusView.js @@ -32,15 +32,9 @@ Ext.define('PVE.openvz.StatusView', { var render_mem = function(value, metaData, record, rowIndex, colIndex, store) { var maxmem = me.getObjectValue('maxmem', 0); - var maxswap = me.getObjectValue('maxswap', 0); - var swap = me.getObjectValue('swap', 0); - - var max = maxmem - maxswap; - var used = value-swap; - - var per = (used / max)*100; - var text = "
Total: " + PVE.Utils.format_size(max) + "
" + - "
Used: " + PVE.Utils.format_size(used) + "
"; + var per = (value / maxmem)*100; + var text = "
Total: " + PVE.Utils.format_size(maxmem) + "
" + + "
Used: " + PVE.Utils.format_size(value) + "
"; return text; };