diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 1ea1f9b0dc..22c455ced2 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1339,37 +1339,48 @@ function updateVMachinesView(request, vmachine_list){ // Some calculations are performed, inspired from what is done // in the CLI function generatePlacementTable(vm){ - var requirements_str = "-"; - var rank_str = "-"; + var requirements_str = vm.USER_TEMPLATE.SCHED_REQUIREMENTS ? vm.USER_TEMPLATE.SCHED_REQUIREMENTS : "-"; + var rank_str = vm.USER_TEMPLATE.SCHED_RANK ? vm.USER_TEMPLATE.SCHED_RANK : "-"; + var ds_requirements_str = vm.USER_TEMPLATE.SCHED_DS_REQUIREMENTS ? vm.USER_TEMPLATE.SCHED_DS_REQUIREMENTS : "-"; + var ds_rank_str = vm.USER_TEMPLATE.SCHED_DS_RANK ? vm.USER_TEMPLATE.SCHED_DS_RANK : "-"; - if (vm.USER_TEMPLATE.SCHED_REQUIREMENTS) - { - requirements_str = vm.USER_TEMPLATE.SCHED_REQUIREMENTS; - } - - if (vm.USER_TEMPLATE.SCHED_RANK) - { - rank_str = vm.USER_TEMPLATE.SCHED_RANK; - } var html = '
\ \ \ \ - \ + \ \ \ \ \ - \ + \ \ \ \ - \ + \ \ \ \
'+tr("Placement")+''+tr("Placement - Host")+'
REQUIREMENTS'+ tr("Requirements")+''+requirements_str+'
RANK'+ tr("Rank")+''+rank_str+'
\ +
\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
'+tr("Placement - Datastore")+'
'+ tr("DS Requirements")+''+ds_requirements_str+'
'+ tr("DS Rank")+''+ds_rank_str+'
\
\
\ \ @@ -1392,7 +1403,11 @@ function generatePlacementTable(vm){ history = vm.HISTORY_RECORDS.HISTORY; else if (vm.HISTORY_RECORDS.HISTORY.SEQ) history = [vm.HISTORY_RECORDS.HISTORY]; - }; + } else { + html += ' \ + \ + ' + } var now = Math.round(new Date().getTime() / 1000);
'+tr("No data avialable in table")+'