diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 1fa9e1e920..2d2b19fdc4 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1121,6 +1121,27 @@ function update_datatable_template_images(datatable, fnDrawCallback) { }); } +function update_datatable_template_files(datatable, fnDrawCallback) { + if (fnDrawCallback) { + datatable.on('draw', fnDrawCallback); + } + + OpenNebula.Image.list({ + timeout: true, + success: function (request, images_list){ + var image_list_array = []; + + $.each(images_list,function(){ + var image_element_array = fileElementArray(this); + if (image_element_array) + image_list_array.push(image_element_array); + }); + + updateView(image_list_array, datatable); + } + }); +} + function update_datatable_template_networks(datatable, fnDrawCallback) { if (fnDrawCallback) { datatable.on('draw', fnDrawCallback); @@ -1257,7 +1278,6 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id) } }); - var dataTable_template_images = $('#'+str_datatable_id, disk_section).dataTable({ "iDisplayLength": 4, "bAutoWidth":false, @@ -1268,7 +1288,6 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id) ] }); - // Retrieve the images to fill the datatable update_datatable_template_images(dataTable_template_images); @@ -1939,298 +1958,252 @@ function setupCreateTemplateDialog(){ **************************************************************************/ var add_osTab = function() { - var html_tab_content = '
  • '+ - '
    '+ - '
    '+ - '
    '+ - '
    '+tr("Boot")+'
    '+ - '
    '+tr("Kernel")+'
    '+ - '
    '+tr("Ramdisk")+'
    '+ - '
    '+tr("Features")+'
    '+ - '
    '+ - '
      '+ - '
    • '+ - '
      '+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - '
      '+tr("CPU architecture to virtualization")+'
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - '
      '+tr("Boot device type")+'
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - '
      '+tr("Device to be mounted as root")+'
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - '
      '+tr("Arguments for the booting kernel")+'
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - '
      '+tr("Path to the bootloader executable")+'
      '+ - '
      '+ - '
      '+ - '
      '+ - '
    • '+ - '
    • '+ - '
      '+ - '
      '+ - ' '+tr("Registered Image")+ - '
      '+ - '
      '+ - ' '+tr("Remote PATH")+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      ' + - '' + - '
      ' + - '
      '+ - ''+ + var html_tab_content = '
    • '+ + ''+ + '
      '+ + '
      '+ + '
      '+tr("Boot")+'
      '+ + '
      '+tr("Kernel")+'
      '+ + '
      '+tr("Ramdisk")+'
      '+ + '
      '+tr("Features")+'
      '+ + '
      '+ + '
        '+ + '
      • '+ + '
        '+ + '
        '+ + '
        '+ + ''+ + '
        '+ + '
        '+ + ''+ + '
        '+ + '
        '+ + '
        '+tr("CPU architecture to virtualization")+'
        '+ + '
        '+ '
        '+ - '
        '+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - '
        '+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Name")+''+tr("Datastore")+''+tr("Size")+''+tr("Type")+''+tr("Registration time")+''+tr("Persistent")+''+tr("Status")+''+tr("#VMS")+''+tr("Target")+'
        '+ - '
        '+ - ''+tr("Please select a Kernel from the list")+''+ - ''+ - ''+ - ''+ - '
        '+ - '
      '+ - ''+ - '
    • '+ - '
    • '+ - '
      '+ - '
      '+ - ' '+tr("Registered Image ") + - '
      '+ - '
      '+ - ' '+tr("Remote PATH")+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      '+ - '
      ' + - '' + - '
      ' + - '
      '+ - ''+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + '
      '+tr("Boot device type")+'
      '+ + '
      '+ + '
      '+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + '
      '+tr("Device to be mounted as root")+'
      '+ + '
      '+ '
      '+ - '
      '+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - '
      '+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Name")+''+tr("Datastore")+''+tr("Size")+''+tr("Type")+''+tr("Registration time")+''+tr("Persistent")+''+tr("Status")+''+tr("#VMS")+''+tr("Target")+'
      '+ - '
      '+ - ''+tr("Please select a Ramdisk from the list")+''+ - ''+ - ''+ - ''+ - '
      '+ '
      '+ - '
    • '+ - '
    • '+ - '
      '+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - '
      '+tr("Add support in the VM for Advanced Configuration and Power Interface (ACPI)")+'
      '+ - '
      '+ + '
    • '+ + '
    • '+ + '
      '+ + '
      '+ + ' '+tr("Registered Image")+ + '
      '+ + '
      '+ + ' '+tr("Remote PATH")+ + '
      '+ + '
      '+ + '
      '+ + '
      '+ + '
      '+ + '
      ' + + '' + + '
      ' + + '
      '+ + ''+ + '
      '+ + '
      '+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + '
      '+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Name")+''+tr("Datastore")+''+tr("Size")+''+tr("Type")+''+tr("Registration time")+''+tr("Persistent")+''+tr("Status")+''+tr("#VMS")+''+tr("Target")+'
      '+ + '
      '+ + ''+tr("Please select a Kernel from the list")+''+ + ''+ + ''+ + ''+ + '
      '+ + '
      '+ + ''+ + '
    • '+ + '
    • '+ + '
      '+ + '
      '+ + ' '+tr("Registered Image ") + + '
      '+ + '
      '+ + ' '+tr("Remote PATH")+ + '
      '+ + '
      '+ + '
      '+ + '
      '+ + '
      '+ + '
      ' + + '' + + '
      ' + + '
      '+ + ''+ + '
      '+ + '
      '+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + '
      '+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Name")+''+tr("Datastore")+''+tr("Size")+''+tr("Type")+''+tr("Registration time")+''+tr("Persistent")+''+tr("Status")+''+tr("#VMS")+''+tr("Target")+'
      '+ + '
      '+ + ''+tr("Please select a Ramdisk from the list")+''+ + ''+ + ''+ + ''+ + '
      '+ + '
      '+ + ''+ + '
    • '+ + '
    • '+ + '
      '+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + '
      '+tr("Add support in the VM for Advanced Configuration and Power Interface (ACPI)")+'
      '+ + '
      '+ + '
      '+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + ''+ + '
      '+ + '
      '+ + '
      '+tr("Add support in the VM for Physical Address Extension (PAE)")+'
      '+ + '
      '+ + '
      '+ '
      '+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - ''+ - '
      '+ - '
      '+ - '
      '+tr("Add support in the VM for Physical Address Extension (PAE)")+'
      '+ - '
      '+ - '
      '+ - '
    '+ - '
  • '+ - ''+ - ''+ + ''+ + ''+ + ''+ '' - $("#refresh_kernel_table").die(); - - $("#refresh_kernel_table").live('click', function(){ - - OpenNebula.Image.list({ - timeout: true, - success: function (request, images_list){ - var image_list_array = []; - - $.each(images_list,function(){ - var file = fileElementArray(this); - if (file) - image_list_array.push(file); - }); - - var dataTable_template_kernel = $('#datatable_kernel').dataTable(); - updateView(image_list_array, dataTable_template_kernel); - dataTable_template_kernel.fnFilter("KERNEL", 7) - }, - error: onError - }); - }); - - $("#refresh_ramdisk_table").die(); - - $("#refresh_ramdisk_table").live('click', function(){ - - OpenNebula.Image.list({ - timeout: true, - success: function (request, images_list){ - var image_list_array = []; - - $.each(images_list,function(){ - var file = fileElementArray(this); - if (file) - image_list_array.push(file); - }); - - var datTable_template_initrd = $('#datatable_initrd').dataTable(); - updateView(image_list_array, datTable_template_initrd); - datTable_template_initrd.fnFilter("RAMDISK", 7) - }, - error: onError - }); - }); - - $("
    OS Booting
    ").appendTo($("dl#template_create_tabs")); $(html_tab_content).appendTo($("ul#template_create_tabs_content")); - var os_section = $('li#osTab', dialog); + var os_section = $('li#osTab', dialog); + var kernel_section = $('li#kernelTab', os_section); + var initrd_section = $('li#ramdiskTab', os_section); - //$('#tabs-bootos', os_section).tabs(); // Select Image or Volatile disk. The div is hidden depending on the selection, and the // vm_param class is included to be computed when the template is generated. @@ -2265,144 +2238,87 @@ function setupCreateTemplateDialog(){ }); var dataTable_template_kernel = $('#datatable_kernel', dialog).dataTable({ - "bSortClasses": false, "bAutoWidth":false, "sDom" : '<"H">t<"F"p>', "iDisplayLength": 4, - "oColVis": { - "aiExclude": [ 0 ] - }, "aoColumnDefs": [ { "sWidth": "35px", "aTargets": [0,1] }, - { "bVisible": false, "aTargets": [0,3,2,5,6,7,9,8,11,12,10]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + { "bVisible": false, "aTargets": [3,2,5,6,7,9,8,11,12,10]} + ] }); + dataTable_template_kernel.fnFilter("KERNEL", 7) - //addElement([spinner,'','','','','','','','','','','',''],dataTable_template_kernel); + $("#refresh_kernel_table").die(); + $("#refresh_kernel_table").live('click', function(){ + update_datatable_template_files(dataTable_template_kernel) + }); // Retrieve the images to fill the datatable - OpenNebula.Image.list({ - timeout: true, - success: function (request, images_list){ - var image_list_array = []; - - $.each(images_list,function(){ - var file = fileElementArray(this); - if (file) - image_list_array.push(file); - }); - - updateView(image_list_array, dataTable_template_kernel); - dataTable_template_kernel.fnFilter("KERNEL", 7) - }, - error: onError - }); - - // TBD Add refresh button for the datatable - - // When a row is selected the background color is updated. If a previous row - // was selected (previous_row) the background color is removed. - // #IMAGE and #IMAGE_ID inputs are updated using the row information - if (typeof previous_kernel_row === 'undefined') { - var previous_kernel_row = 0; - } - - $('#datatable_kernel tbody', dialog).delegate("tr", "click", function(e){ - if ($(e.target).is('input') || - $(e.target).is('select') || - $(e.target).is('option')) return true; - - var aData = dataTable_template_kernel.fnGetData(this); - - if (previous_kernel_row) - $("td:first", previous_kernel_row).parent().children().each(function(){$(this).removeClass('markrow');}); - previous_kernel_row = this; - $("td:first", this).parent().children().each(function(){$(this).addClass('markrow');}); - - $('.kernel_ds .alert-box', os_section).hide(); - - $('#KERNEL', os_section).text(aData[4]); - $('#KERNEL_DS', os_section).val("$FILE[IMAGE_ID="+ aData[1] +"]"); - return false; - }); + update_datatable_template_files(dataTable_template_kernel); $('#kernel_search', dialog).keyup(function(){ - dataTable_template_kernel.fnFilter( $(this).val() ); + dataTable_template_kernel.fnFilter( $(this).val() ); }) - var datTable_template_initrd = $('#datatable_initrd', dialog).dataTable({ - "bSortClasses": false, + $('#datatable_kernel tbody', dialog).delegate("tr", "click", function(e){ + var aData = dataTable_template_kernel.fnGetData(this); + + $("td.markrowchecked", kernel_section).removeClass('markrowchecked'); + $('tbody input.check_item', kernel_section).removeAttr('checked'); + + $('#image_selected', kernel_section).show(); + $('#select_image', kernel_section).hide(); + $('.alert-box', kernel_section).hide(); + + $("td", this).addClass('markrowchecked'); + $('input.check_item', this).attr('checked','checked'); + + $('#KERNEL', kernel_section).text(aData[4]); + $('#KERNEL_DS', kernel_section).val("$FILE[IMAGE_ID="+ aData[1] +"]"); + return true; + }); + + + var datTable_template_initrd = $('#datatable_initrd', dialog).dataTable({ "bAutoWidth":false, "iDisplayLength": 4, "sDom" : '<"H">t<"F"p>', - "oColVis": { - "aiExclude": [ 0 ] - }, "aoColumnDefs": [ { "sWidth": "35px", "aTargets": [0,1] }, - { "bVisible": false, "aTargets": [0,2,3,5,6,7,9,8,10,11,12]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" + { "bVisible": false, "aTargets": [2,3,5,6,7,9,8,10,11,12]} + ] }); - //addElement([spinner,'','','','','','','','','','','',''],datTable_template_initrd); + datTable_template_initrd.fnFilter("RAMDISK", 7) - // Retrieve the images to fill the datatable - OpenNebula.Image.list({ - timeout: true, - success: function (request, images_list){ - var image_list_array = []; - - $.each(images_list,function(){ - var file = fileElementArray(this); - if (file) - image_list_array.push(file); - }); - - updateView(image_list_array, datTable_template_initrd); - datTable_template_initrd.fnFilter("RAMDISK", 7) - }, - error: onError + $("#refresh_ramdisk_table").die(); + $("#refresh_ramdisk_table").live('click', function(){ + update_datatable_template_files(datTable_template_initrd) }); + update_datatable_template_files(datTable_template_initrd); + $('#initrd_search', dialog).keyup(function(){ - datTable_template_initrd.fnFilter( $(this).val() ); + datTable_template_initrd.fnFilter( $(this).val() ); }) - // TBD Add refresh button for the datatable - - // When a row is selected the background color is updated. If a previous row - // was selected (previous_row) the background color is removed. - // #IMAGE and #IMAGE_ID inputs are updated using the row information - if (typeof previous_initrd_row === 'undefined') { - var previous_initrd_row = 0; - } - $('#datatable_initrd tbody', dialog).delegate("tr", "click", function(e){ - if ($(e.target).is('input') || - $(e.target).is('select') || - $(e.target).is('option')) return true; - var aData = datTable_template_initrd.fnGetData(this); - if (previous_initrd_row) - $("td:first", previous_initrd_row).parent().children().each(function(){$(this).removeClass('markrow');}); - previous_initrd_row = this; - $("td:first", this).parent().children().each(function(){$(this).addClass('markrow');}); + $("td.markrowchecked", initrd_section).removeClass('markrowchecked'); + $('tbody input.check_item', initrd_section).removeAttr('checked'); - $('.initrd_ds .alert-box', os_section).hide(); + $('#image_selected', initrd_section).show(); + $('#select_image', initrd_section).hide(); + $('.alert-box', initrd_section).hide(); + + $("td", this).addClass('markrowchecked'); + $('input.check_item', this).attr('checked','checked'); $('#INITRD', os_section).text(aData[4]); $('#INITRD_DS', os_section).val("$FILE[IMAGE_ID="+ aData[1] +"]"); - return false; + return true; }); // Hide image advanced options @@ -3839,7 +3755,7 @@ function fillTemplatePopUp(request, response){ var dataTable_template_networks = $("#datatable_template_networks" + number_of_nics).dataTable(); - var disk_image_id = nic.NETWORK_ID + var nic_network_id = nic.NETWORK_ID // TODO updateView should not be required. Currently the dataTable // is filled twice. update_datatable_template_networks(dataTable_template_networks, function(){ @@ -3851,7 +3767,7 @@ function fillTemplatePopUp(request, response){ var current_row = $(rows[j]); var row_network_id = $(rows[j]).find("td:eq(1)").html(); - if (row_network_id == disk_image_id) { + if (row_network_id == nic_network_id) { rows[j].click(); clicked = true; } @@ -3859,7 +3775,7 @@ function fillTemplatePopUp(request, response){ if (!clicked) { var alert = '
    '+ -'NETWORK: '+ disk_image_id + tr(" does not exists any more") + +'NETWORK: '+ nic_network_id + tr(" does not exists any more") + ' ×'+ '
    '; @@ -3895,52 +3811,44 @@ function fillTemplatePopUp(request, response){ var os = template.OS; var os_section = $('li#osTab', $create_template_dialog); + var kernel_section = $('li#kernelTab', $create_template_dialog); + var initrd_section = $('li#ramdiskTab', $create_template_dialog); if (os) { if (os.KERNEL_DS) { - $('input#radioKernelDs', os_section).click(); + $('input#radioKernelDs', kernel_section).click(); - var dataTable_template = $("#datatable_kernel").dataTable(); - var regexp = /\$FILE\[IMAGE_ID=([0-9]+)+/; + var dataTable_template_kernel = $("#datatable_kernel").dataTable(); + var os_kernel_ds = os.KERNEL_DS; // TODO updateView should not be required. Currently the dataTable // is filled twice. - OpenNebula.Image.list({ - timeout: true, - success: function (request, list){ - var list_array = []; + update_datatable_template_files(dataTable_template_kernel, function(){ + dataTable_template_kernel.unbind('draw'); - $.each(list,function(){ - list_array.push(imageElementArray(this)); - }); + var rows = dataTable_template_kernel.fnGetNodes(); + var regexp = /\$FILE\[IMAGE_ID=([0-9]+)+/; + var match = regexp.exec(os_kernel_ds) + var clicked = false; + for (var j=0;j×'+ ''; - $("#tabs-kernel .dataTables_wrapper", os_section).append(alert); - } - }, - error: onError - }); + $(".dataTables_wrapper", kernel_section).append(alert); + } + }) } else if (os.KERNEL) { $('input#radioKernelPath', os_section).click(); @@ -3949,47 +3857,37 @@ function fillTemplatePopUp(request, response){ if (os.INITRD_DS) { $('input#radioInitrdDs', os_section).click(); - var dataTable_template = $("#datatable_initrd").dataTable(); - var regexp = /\$FILE\[IMAGE_ID=([0-9]+)+/; + var dataTable_template_initrd = $("#datatable_initrd").dataTable(); + var os_initrd_ds = os.INITRD_DS; // TODO updateView should not be required. Currently the dataTable // is filled twice. - OpenNebula.Image.list({ - timeout: true, - success: function (request, list){ - var list_array = []; + update_datatable_template_files(dataTable_template_initrd, function(){ + dataTable_template_initrd.unbind('draw'); - $.each(list,function(){ - list_array.push(imageElementArray(this)); - }); + var rows = dataTable_template_initrd.fnGetNodes(); + var regexp = /\$FILE\[IMAGE_ID=([0-9]+)+/; + var match = regexp.exec(os_initrd_ds) + var clicked = false; + for (var j=0;j×'+ ''; - $("#tabs-ramdisk .dataTables_wrapper", os_section).append(alert); - } - }, - error: onError - }); + $(".dataTables_wrapper", initrd_section).append(alert); + } + }) } else if (os.INITRD) { $('input#radioInitrdPath', os_section).click();