diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 5e95288d7b..1a7b3feb7b 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -230,6 +230,15 @@ var vm_actions = { }, error: onError }, + "VM.showscheduling" : { + type: "single", + call: OpenNebula.VM.show, + callback: function(request, vm){ + updateVMachineElement(request, vm); + updateSchedulingInfo(request, vm); + }, + error: onError + }, "VM.refresh" : { type: "custom", call : function (){ @@ -657,8 +666,7 @@ var vm_actions = { call: OpenNebula.VM.update, callback: function(request,response){ notifyMessage(tr("VirtualMachine updated correctly")); - Sunstone.runAction('VM.showinfo',request.request.data[0]); - Sunstone.runAction("VM.show",request.request.data[0]); + Sunstone.runAction("VM.showscheduling", request.request.data[0]); }, error: onError }, @@ -1302,7 +1310,7 @@ function updateVMInfo(request,vm){ }; var scheduling_tab = { - title: tr("Scheduling"), + title: tr("Actions"), content: printSchedulingTable(vm_info) }; @@ -1369,7 +1377,8 @@ function updateVMDisksInfo(request,vm){ function printSchedulingTable(vm_info) { - var str = '
\ + var str = '\ +
\ \ \ \ @@ -1389,35 +1398,88 @@ function printSchedulingTable(vm_info) // Remove previous listeners $(".remove_x").die(); $(".edit_e").die(); + $('#add_scheduling_action').die(); + $("#submit_scheduling_action").die(); + $(".select_action").die(); + $(".input_edit_time").die(); - // Add listener for add key and add value for Extended Template - $('#button_add_value').live("click", function() { - if ( $('#new_value').val() != "" && $('#new_key').val() != "" ) + $('#add_scheduling_action').live('click', function(){ + // Create a new row with add button + // Change focus + $("#add_scheduling_action").attr("disabled", "disabled"); + + // + $("#scheduling_actions_table").append('\ + \ + \ + \ + '); + + return false; + }); + + $("#submit_scheduling_action").live("click", function() { + var date_input_value = $("#date_time_input").val(); + + if (date_input_value=="") + return false; + + // Calculate MAX_ID + var max_id = -1; + + if (vm_info.USER_TEMPLATE.SCHED_ACTION) { - var template_json_bk = $.extend({}, template_json); - template_json[$.trim($('#new_key').val())] = $.trim($('#new_value').val()); - template_str = convert_template_to_string(template_json,unshown_values); - - Sunstone.runAction(resource_type+".update_template",resource_id,template_str); - template_json = template_json_bk; - } - }); - - // Capture the enter key - $('#new_value').live("keypress", function(e) { - var ev = e || window.event; - var key = ev.keyCode; - - if (key == 13) + if (!vm_info.USER_TEMPLATE.SCHED_ACTION.length) { - //Get the button the user wants to have clicked - $('#button_add_value').click(); - ev.preventDefault(); + var tmp_element = vm_info.USER_TEMPLATE.SCHED_ACTION; + vm_info.USER_TEMPLATE.SCHED_ACTION = new Array(); + vm_info.USER_TEMPLATE.SCHED_ACTION.push(tmp_element); } - }) - // Listener for single values + $.each(vm_info.USER_TEMPLATE.SCHED_ACTION, function(i,element){ + if (max_id' + tr("stop") + '\ \ \ - \ - \ - \ - \ - \ - \ + \ + \ + \ + \ + \ + \ \ ') $(".select_action").val(value_str); @@ -1490,12 +1552,12 @@ function printSchedulingTable(vm_info) var value_str = $(this).val(); $.each(vm_info.USER_TEMPLATE.SCHED_ACTION, function(i,element){ - tmp_tmpl[i] = element; if(element.ID==index) { var epoch_str = new Date(value_str); - tmp_tmpl[i].TIME = parseInt(epoch_str.getTime())/1000; + element.TIME = parseInt(epoch_str.getTime())/1000; } + tmp_tmpl.push(element); }) vm_info.USER_TEMPLATE.SCHED_ACTION = tmp_tmpl; @@ -1553,7 +1615,7 @@ function fromJSONtoSchedulingActionRow(scheduling_action){ return str; } -function setupDateTimePicker(time_str){ +function setupDateTimePicker(input_to_fill, time_str){ dialogs_context.append('
'); $date_time_picker_dialog = $('#date_time_picker_dialog',dialogs_context); var dialog = $date_time_picker_dialog; @@ -1600,6 +1662,10 @@ function setupDateTimePicker(time_str){ }); }; +function updateSchedulingInfo(request,vm){ + $("li#vm_scheduling_tabTab").html(printSchedulingTable(vm.VM)); +} + // Generates the HTML for the hotplugging tab // This is a list of disks with the save_as, detach options. // And a form to attach a new disk to the VM, if it is running. @@ -1940,9 +2006,6 @@ function hotpluggingOps(){ - - - function updateVMNicsInfo(request,vm){ $("li#vm_network_tabTab").html(printNics(vm.VM)); } @@ -2379,9 +2442,6 @@ function setup_vm_capacity_tab(){ } - - - function updateVMSnapshotsInfo(request,vm){ $("li#vm_snapshot_tabTab").html(printSnapshots(vm.VM)); } @@ -2591,28 +2651,6 @@ function setup_vm_snapshot_tab(){ } - - - - - - - - - - - - - - - - - - - - - - // Sets up the create-template dialog and all the processing associated to it, // which is a lot. function setupCreateVMDialog(){ @@ -2856,7 +2894,6 @@ $(document).ready(function(){ setup_vm_capacity_tab(); setup_vm_snapshot_tab(); - initCheckAllBoxes(dataTable_vMachines); tableCheckboxesListener(dataTable_vMachines); infoListener(dataTable_vMachines,'VM.showinfo');
\ + \ + \ +