From fa15635ed3ca1d9672536b08b56fea89a1969fbc Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 24 Apr 2015 13:55:40 +0200 Subject: [PATCH] feature #3748: Add limit attr --- .../public/app/tabs/datastores-tab/panels/info.js | 9 ++++++++- .../public/app/tabs/datastores-tab/panels/info/html.hbs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js index 872a84e4ff..9dc87cdc3d 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js @@ -1,6 +1,7 @@ define(function(require) { var TemplateInfo = require('hbs!./info/html'); var Locale = require('utils/locale'); + var Humanize = require('utils/humanize'); var RenameTr = require('utils/panel/rename-tr'); var TemplateTable = require('utils/panel/template-table'); var PermissionsTable = require('utils/panel/permissions-table'); @@ -23,6 +24,11 @@ define(function(require) { var capacityBar = DatastoreCapacityBar.html(element); var stateStr = Locale.tr(OpenNebulaDatastore.stateStr(element.STATE)); + var limitStr = '-'; + if (element.TEMPLATE.SHARED == "NO" || element.TEMPLATE.LIMIT_MB != undefined) { + limitStr = Humanize.sizeFromMB(element.TEMPLATE.LIMIT_MB) + } + return TemplateInfo({ 'element': element, 'renameTrHTML': renameTrHTML, @@ -30,7 +36,8 @@ define(function(require) { 'templateTableHTML': templateTableHTML, 'permissionsTableHTML': permissionsTableHTML, 'capacityBar': capacityBar, - 'stateStr': stateStr + 'stateStr': stateStr, + 'limitStr': limitStr }); } diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs index 3db7ee13f4..cd8f778955 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs @@ -29,7 +29,7 @@ {{tr "Limit"}} - - + {{limitStr}}