shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Feature #1218: add IP column to compute list in Selfservice

Browse Source 
(cherry picked from commit 5fcb907a9ecfc8b561f125dfe10a55e1b4e204f4)
This commit is contained in:
Hector Sanjuan 2012-04-24 12:44:21 +02:00 committed by Ruben S. Montero
parent fda4161a6c
commit fda520349f
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cloud/occi/lib/ui/public/js/plugins/compute.js
View File

@ -63,6 +63,7 @@ var vms_tab_content =
<th class="check"><input type="checkbox" class="check_all" value="">'+tr("All")+'</input></th>\
<th>'+tr("ID")+'</th>\
<th>'+tr("Name")+' / '+tr("State")+'</th>\
<th>'+tr("IP")+'</th>\
</tr>\
</thead>\
<tbody id="tbodyvmachines">\
@ -397,6 +398,20 @@ function str_start_time(vm){
return pretty_time(vm.STIME);
}
function ip_str(vm){
var nic = vm.NIC;
var ip = '--';
if ($.isArray(nic)) {
ip = '';
$.each(nic, function(index,value){
ip += value.IP+'<br />';
});
} else if (nic && nic.IP) {
ip = nic.IP;
};
return ip;
};
// Returns an array formed by the information contained in the vm_json
// and ready to be introduced in a dataTable
function vMachineElementArray(vm_json){
@ -416,7 +431,8 @@ function vMachineElementArray(vm_json){
return [
'<input class="check_item" type="checkbox" id="vm_'+id+'" name="selected_items" value="'+id+'"/>',
id,
VMStateBulletStr(vm_json) + name
VMStateBulletStr(vm_json) + name,
ip_str(vm)
];
}
@ -454,7 +470,7 @@ function addVMachineElement(request,vm_json){
var id = vm_json.COMPUTE.ID;
var element = vMachineElementArray(vm_json);
addElement(element,dataTable_vMachines);
Sunstone.runAction("VM.showstate",id);
Sunstone.runAction("VM.show",id);
}
@ -1097,6 +1113,7 @@ $(document).ready(function(){
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0] },
{ "sWidth": "35px", "aTargets": [1] },
{ "sWidth": "110px", "aTargets": [3] },
],
"oLanguage": (datatable_lang != "") ?
{
@ -1107,7 +1124,7 @@ $(document).ready(function(){
dataTable_vMachines.fnClearTable();
addElement([
spinner,
'',''],dataTable_vMachines);
'','',''],dataTable_vMachines);
Sunstone.runAction("VM.list");
//setupCreateVMDialog();