diff --git a/src/sunstone/public/app/utils/tab-datatable.js b/src/sunstone/public/app/utils/tab-datatable.js index 334d05eff4..ac78287e23 100644 --- a/src/sunstone/public/app/utils/tab-datatable.js +++ b/src/sunstone/public/app/utils/tab-datatable.js @@ -255,7 +255,7 @@ define(function(require) { $('.check_item', this).trigger('click'); } - return false; + return true; }); } diff --git a/src/sunstone/public/app/utils/vcenter/networks.js b/src/sunstone/public/app/utils/vcenter/networks.js index 656a9849b0..e07b7bfd95 100644 --- a/src/sunstone/public/app/utils/vcenter/networks.js +++ b/src/sunstone/public/app/utils/vcenter/networks.js @@ -19,6 +19,8 @@ define(function(require) { var Locale = require('utils/locale'); var OpenNebulaNetwork = require('opennebula/network'); var OpenNebulaError = require('opennebula/error'); + var DomDataTable = require('utils/dom-datatable'); + var Notifier = require('utils/notifier'); var TemplateHTML = require('hbs!./networks/html'); @@ -99,6 +101,18 @@ define(function(require) { '' + '').appendTo($(".content", context)) } else { + var newdiv = $( + '
| ' + + '' + + ' |
|---|
' + - Locale.tr("Virtual Network created successfully") + ' ID:' + response.VNET.ID + - '
'); - }, - error: function (request, error_json) { - $(".vcenter_network_result", network_context).html('' + - '' + - '' + - ''); - - $(".vcenter_network_response", network_context).html('' + - (error_json.error.message || Locale.tr("Cannot contact server: is it running and reachable?")) + - '
'); + if ($(".vlaninfo", network_context)) { + network_tmpl += "VLAN=\"YES\"\n"; + network_tmpl += "VLAN_ID=" + $(".vlaninfo", network_context).val() + "\n"; } + + var vnet_json = { + "vnet": { + "vnet_raw": network_tmpl + } + }; + + OpenNebulaNetwork.create({ + timeout: true, + data: vnet_json, + success: function(request, response) { + $(".vcenter_network_result", network_context).addClass("success").html( + '' + + '' + + '' + + ''); + + $(".vcenter_network_response", network_context).html('' + + Locale.tr("Virtual Network created successfully") + ' ID:' + response.VNET.ID + + '
'); + }, + error: function (request, error_json) { + $(".vcenter_network_result", network_context).html('' + + '' + + '' + + ''); + + $(".vcenter_network_response", network_context).html('' + + (error_json.error.message || Locale.tr("Cannot contact server: is it running and reachable?")) + + '
'); + } + }); }); }); diff --git a/src/sunstone/public/app/utils/vcenter/templates.js b/src/sunstone/public/app/utils/vcenter/templates.js index 770e11d87c..75542e3519 100644 --- a/src/sunstone/public/app/utils/vcenter/templates.js +++ b/src/sunstone/public/app/utils/vcenter/templates.js @@ -19,6 +19,8 @@ define(function(require) { var Locale = require('utils/locale'); var OpenNebulaTemplate = require('opennebula/template'); var OpenNebulaError = require('opennebula/error'); + var DomDataTable = require('utils/dom-datatable'); + var Notifier = require('utils/notifier'); var TemplateHTML = require('hbs!./templates/html'); @@ -99,25 +101,60 @@ define(function(require) { '| ' + + ' | ' + Locale.tr("Name") + ' | ' + + '' + Locale.tr("Datacenter") + ' | ' + + '' + + ' | ' + + '' + + '' + + ' |
|---|
' + - Locale.tr("Template created successfully") + ' ID:' + response.VMTEMPLATE.ID + - '
'); - }, - error: function (request, error_json) { - $(".vcenter_template_result", template_context).html('' + - '' + - '' + - ''); + $(".vcenter_template_response", template_context).html('' + + Locale.tr("Template created successfully") + ' ID:' + response.VMTEMPLATE.ID + + '
'); + }, + error: function (request, error_json) { + $(".vcenter_template_result", template_context).html('' + + '' + + '' + + ''); - $(".vcenter_template_response", template_context).html('' + - (error_json.error.message || Locale.tr("Cannot contact server: is it running and reachable?")) + - '
'); - } + $(".vcenter_template_response", template_context).html('' + + (error_json.error.message || Locale.tr("Cannot contact server: is it running and reachable?")) + + '
'); + } + }); }); }); }