From d04b77a2583ff09baffd15514e5c26cdfebb94b3 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 1 Mar 2013 13:16:49 +0100 Subject: [PATCH] feature #1664: Fix group tab users length --- src/sunstone/public/js/plugins/groups-tab.js | 2 +- src/sunstone/public/js/plugins/users-tab.js | 164 +++++++++---------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 2bf7744bf6..4ac5d2d915 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -387,7 +387,7 @@ function groupElementArray(group_json){ // users_str=getUserName(group.USERS.ID); //}; - var users_str = group.USERS.ID.length; + var users_str = group.USERS.ID ? group.USERS.ID.length : 0; var vms = "-"; var memory = "-"; diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 9a10f90fb6..ce0fd5ddce 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -421,10 +421,10 @@ var user_info_panel = { title: tr("User quotas"), content:"" }, - "user_acct_tab" : { - title: tr("Historical usages"), - content: "" - } + //"user_acct_tab" : { + // title: tr("Historical usages"), + // content: "" + //} }; var users_tab = { @@ -800,90 +800,90 @@ function updateUserInfo(request,user){ content : quotas_tab_html }; - var acct_tab = { - title : tr("Historical usages"), - content : '
\ - \ - \ - \ - \ -\ -
\ - \ - \ - \ -
' + generateMonitoringDivs(user_acct_graphs, "user_acct_") - }; +// var acct_tab = { +// title : tr("Historical usages"), +// content : '
\ +// \ +// \ +// \ +// \ +//\ +//
\ +// \ +// \ +// \ +//
' + generateMonitoringDivs(user_acct_graphs, "user_acct_") +// }; Sunstone.updateInfoPanelTab("user_info_panel","user_info_tab",info_tab); Sunstone.updateInfoPanelTab("user_info_panel","user_quotas_tab",quotas_tab); - Sunstone.updateInfoPanelTab("user_info_panel","user_acct_tab",acct_tab); + //Sunstone.updateInfoPanelTab("user_info_panel","user_acct_tab",acct_tab); Sunstone.popUpInfoPanel("user_info_panel"); //Enable datepicker - var info_dialog = $('div#user_acct_tab'); - $("#user_acct_from", info_dialog).datepicker({ - defaultDate: "-1d", - changeMonth: true, - numberOfMonths: 1, - dateFormat: "dd/mm/yy", - defaultDate: '-1', - onSelect: function( selectedDate ) { - $( "#user_acct_to", info_dialog).datepicker("option", - "minDate", - selectedDate ); - } - }); - $("#user_acct_from", info_dialog).datepicker('setDate', '-1'); - - $("#user_acct_to", info_dialog).datepicker({ - defaultDate: "0", - changeMonth: true, - numberOfMonths: 1, - dateFormat: "dd/mm/yy", - maxDate: '+1', - onSelect: function( selectedDate ) { - $( "#user_acct_from", info_dialog).datepicker( "option", - "maxDate", - selectedDate ); - } - }); - $("#user_acct_to", info_dialog).datepicker('setDate', 'Now'); - - //Listen to set date button - $('button#user_acct_date_ok', info_dialog).click(function(){ - var from = $("#user_acct_from", info_dialog).val(); - var to = $("#user_acct_to", info_dialog).val(); - - var start = $.datepicker.parseDate('dd/mm/yy', from) - if (start){ - start = start.getTime(); - start = Math.floor(start / 1000); - } - - var end = $.datepicker.parseDate('dd/mm/yy', to); - if (end){ - end = end.getTime(); - end = Math.floor(end / 1000); - } - - loadAccounting('User', user_info.ID, user_acct_graphs, - { start : start, end: end }); - return false; - }); - - //preload acct - loadAccounting('User', user_info.ID, user_acct_graphs); + //var info_dialog = $('div#user_acct_tab'); + //$("#user_acct_from", info_dialog).datepicker({ + // defaultDate: "-1d", + // changeMonth: true, + // numberOfMonths: 1, + // dateFormat: "dd/mm/yy", + // defaultDate: '-1', + // onSelect: function( selectedDate ) { + // $( "#user_acct_to", info_dialog).datepicker("option", + // "minDate", + // selectedDate ); + // } + //}); + //$("#user_acct_from", info_dialog).datepicker('setDate', '-1'); +// + //$("#user_acct_to", info_dialog).datepicker({ + // defaultDate: "0", + // changeMonth: true, + // numberOfMonths: 1, + // dateFormat: "dd/mm/yy", + // maxDate: '+1', + // onSelect: function( selectedDate ) { + // $( "#user_acct_from", info_dialog).datepicker( "option", + // "maxDate", + // selectedDate ); + // } + //}); + //$("#user_acct_to", info_dialog).datepicker('setDate', 'Now'); +// + ////Listen to set date button + //$('button#user_acct_date_ok', info_dialog).click(function(){ + // var from = $("#user_acct_from", info_dialog).val(); + // var to = $("#user_acct_to", info_dialog).val(); +// + // var start = $.datepicker.parseDate('dd/mm/yy', from) + // if (start){ + // start = start.getTime(); + // start = Math.floor(start / 1000); + // } +// + // var end = $.datepicker.parseDate('dd/mm/yy', to); + // if (end){ + // end = end.getTime(); + // end = Math.floor(end / 1000); + // } +// + // loadAccounting('User', user_info.ID, user_acct_graphs, + // { start : start, end: end }); + // return false; + //}); +// + ////preload acct + //loadAccounting('User', user_info.ID, user_acct_graphs); }; // Prepare the user creation dialog