diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index f40e0c2af6..c4426b85eb 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -506,9 +506,12 @@ function userElementArray(user_json){
var cpu = "-";
if (!$.isEmptyObject(user.VM_QUOTA)){
- vms = user.VM_QUOTA.VM.VMS_USED;
- memory = user.VM_QUOTA.VM.MEMORY_USED+' MB';
- cpu = user.VM_QUOTA.VM.CPU_USED;
+ vms = user.VM_QUOTA.VM.VMS_USED+' / '
+ +user.VM_QUOTA.VM.VMS;
+ memory = humanize_size(user.VM_QUOTA.VM.MEMORY_USED * 1024)+' / '
+ +humanize_size(user.VM_QUOTA.VM.MEMORY * 1024);
+ cpu = user.VM_QUOTA.VM.CPU_USED+' / '
+ +user.VM_QUOTA.VM.CPU;
}
@@ -605,25 +608,127 @@ function updateUserInfo(request,user){
var quotas_tab_html = '';
- if (!$.isEmptyObject(user_info.VM_QUOTA))
- quotas_tab_html += '
\
- '+prettyPrintJSON(user_info.VM_QUOTA)+'\
-
'
+ if (!$.isEmptyObject(user_info.VM_QUOTA)){
+ quotas_tab_html +=
+ '\
+ \
+ \
+ | '+tr("VMs")+' | \
+ '+tr("Memory")+' | \
+ '+tr("CPU")+' | \
+
\
+ \
+ \
+ \
+ | '+user_info.VM_QUOTA.VM.VMS_USED+' / '
+ +user_info.VM_QUOTA.VM.VMS+' | \
+ '+humanize_size(user_info.VM_QUOTA.VM.MEMORY_USED * 1024)+' / '
+ +humanize_size(user_info.VM_QUOTA.VM.MEMORY * 1024)+' | \
+ '+user_info.VM_QUOTA.VM.CPU_USED+' / '
+ +user_info.VM_QUOTA.VM.CPU+' | \
+
\
+ \
+
'
+ }
- if (!$.isEmptyObject(user_info.DATASTORE_QUOTA))
- quotas_tab_html += '\
- '+prettyPrintJSON(user_info.DATASTORE_QUOTA)+'\
-
'
+ if (!$.isEmptyObject(user_info.DATASTORE_QUOTA)){
+ quotas_tab_html +=
+ '\
+ \
+ \
+ | '+tr("Datastore ID")+' | \
+ '+tr("Images")+' | \
+ '+tr("Size")+' | \
+
\
+ \
+ ';
- if (!$.isEmptyObject(user_info.IMAGE_QUOTA))
- quotas_tab_html += '\
- '+prettyPrintJSON(user_info.IMAGE_QUOTA)+'\
-
';
+ var ds_quotas = [];
- if (!$.isEmptyObject(user_info.NETWORK_QUOTA))
- quotas_tab_html += '\
- '+prettyPrintJSON(user_info.NETWORK_QUOTA)+'\
-
';
+ if ($.isArray(user_info.DATASTORE_QUOTA.DATASTORE))
+ ds_quotas = user_info.DATASTORE_QUOTA.DATASTORE;
+ else if (user_info.DATASTORE_QUOTA.DATASTORE.ID)
+ ds_quotas = [user_info.DATASTORE_QUOTA.DATASTORE];
+
+ for (var i=0; i < ds_quotas.length; i++){
+ quotas_tab_html +=
+ '\
+ | '+ds_quotas[i].ID+' | \
+ '+ds_quotas[i].IMAGES_USED+' / '
+ +ds_quotas[i].IMAGES+' | \
+ '+humanize_size(ds_quotas[i].SIZE_USED * 1024)+' / '
+ +humanize_size(ds_quotas[i].SIZE * 1024)+' | \
+
';
+ }
+
+ quotas_tab_html +=
+ '\
+
';
+ }
+
+ if (!$.isEmptyObject(user_info.IMAGE_QUOTA)){
+ quotas_tab_html +=
+ '\
+ \
+ \
+ | '+tr("Image ID")+' | \
+ '+tr("Running VMs")+' | \
+
\
+ \
+ ';
+
+ var img_quotas = [];
+
+ if ($.isArray(user_info.IMAGE_QUOTA.IMAGE))
+ img_quotas = user_info.IMAGE_QUOTA.IMAGE;
+ else if (user_info.IMAGE_QUOTA.IMAGE.ID)
+ img_quotas = [user_info.IMAGE_QUOTA.IMAGE];
+
+ for (var i=0; i < img_quotas.length; i++){
+ quotas_tab_html +=
+ '\
+ | '+img_quotas[i].ID+' | \
+ '+img_quotas[i].RVMS_USED+' / '
+ +img_quotas[i].RVMS+' | \
+
';
+ }
+
+ quotas_tab_html +=
+ '\
+
';
+ }
+
+ if (!$.isEmptyObject(user_info.NETWORK_QUOTA)){
+ quotas_tab_html +=
+ '\
+ \
+ \
+ | '+tr("Network ID")+' | \
+ '+tr("Leases")+' | \
+
\
+ \
+ ';
+
+ var net_quotas = [];
+
+ if ($.isArray(user_info.NETWORK_QUOTA.NETWORK))
+ net_quotas = user_info.NETWORK_QUOTA.NETWORK;
+ else if (user_info.NETWORK_QUOTA.NETWORK.ID)
+ net_quotas = [user_info.NETWORK_QUOTA.NETWORK];
+
+ for (var i=0; i < net_quotas.length; i++){
+ quotas_tab_html +=
+ '\
+ | '+net_quotas[i].ID+' | \
+ '+net_quotas[i].LEASES_USED+' / '
+ +net_quotas[i].LEASES+' | \
+
';
+ }
+
+ quotas_tab_html +=
+ '\
+
';
+ }
var quotas_tab = {
title : tr("User quotas"),
@@ -840,14 +945,16 @@ $(document).ready(function(){
//if we are not oneadmin, our tab will not even be in the DOM.
dataTable_users = $("#datatable_users",main_tabs_context).dataTable({
"sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
+// "bAutoWidth":false,
"oColVis": {
"aiExclude": [ 0 ]
},
"aoColumnDefs": [
//{ "bSortable": false, "aTargets": ["check"] },
- { "sWidth": "60px", "aTargets": [0] },
- { "sWidth": "35px", "aTargets": [1,5,6,7,8] },
+// { "sWidth": "60px", "aTargets": [0] },
+// { "sWidth": "35px", "aTargets": [1] },
{ "sWidth": "150px", "aTargets": [4] },
+ { "sWidth": "150px", "aTargets": [5,6,7] },
{ "bVisible": false, "aTargets": [8]}
],
"oLanguage": (datatable_lang != "") ?