diff --git a/src/sunstone/public/app/opennebula.js b/src/sunstone/public/app/opennebula.js index 6cb9e1be56..dc1224b01d 100644 --- a/src/sunstone/public/app/opennebula.js +++ b/src/sunstone/public/app/opennebula.js @@ -59,14 +59,6 @@ define(function(require) { }); } - $.ajaxSetup({ - converters: { - "text json": function(textValue) { - return jQuery.parseJSON(jQuery('
').text(textValue).html()); - } - } - }); - var OpenNebula = { 'Helper': Helper, 'Action': Action, diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs index ec634db235..416f5aa506 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs @@ -29,7 +29,7 @@ {{#if appTemplate}}
- {{~htmlDecode appTemplate~}}
+ {{~appTemplate~}}
{{else}}
@@ -51,7 +51,7 @@ {{#if vmTemplate}}
- {{~htmlDecode vmTemplate~}}
+ {{~vmTemplate~}}
{{else}}
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js index e6244deff4..3e85ec8994 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js @@ -196,7 +196,7 @@ define(function(require) { this.resourceId = element.ID; // Populates the Avanced mode Tab - $('#template', context).val(TemplateUtils.templateToEditor(element.TEMPLATE)); + $('#template', context).val(TemplateUtils.templateToString(element.TEMPLATE)); WizardFields.fill(context, element.TEMPLATE); diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js index bc8cb5eb7b..ea96f297fd 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js @@ -25,7 +25,6 @@ define(function(require) { var Locale = require('utils/locale'); var Tips = require('utils/tips'); var RoleTab = require('tabs/oneflow-templates-tab/utils/role-tab'); - var TemplateUtils = require('utils/template-utils'); /* TEMPLATES @@ -267,14 +266,13 @@ define(function(require) { this.resourceId = element.ID; // Populates the Avanced mode Tab - $('#template', context).val(TemplateUtils.htmlDecode( - JSON.stringify(element.TEMPLATE.BODY, null, " "))); + $('#template', context).val(JSON.stringify(element.TEMPLATE.BODY, null, " ")); $("#service_name", context).attr("disabled", "disabled"); - $("#service_name", context).val(TemplateUtils.htmlDecode(element.NAME)); + $("#service_name", context).val(element.NAME); - $("#description", context).val(TemplateUtils.htmlDecode(element.TEMPLATE.BODY.description)); + $("#description", context).val(element.TEMPLATE.BODY.description); $('select[name="deployment"]', context).val(element.TEMPLATE.BODY.deployment); $("select[name='shutdown_action_service']", context).val(element.TEMPLATE.BODY.shutdown_action); @@ -301,8 +299,8 @@ define(function(require) { $(".add_service_network", context).trigger("click"); var tr = $(".service_networks tbody tr", context).last(); - $(".service_network_name", tr).val(TemplateUtils.htmlDecode(attrs.name)).change(); - $(".service_network_description", tr).val(TemplateUtils.htmlDecode(attrs.description)); + $(".service_network_name", tr).val(attrs.name).change(); + $(".service_network_description", tr).val(attrs.description); break; } diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js index 952e06270e..b803651ecf 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js @@ -28,7 +28,6 @@ define(function(require) { var OpenNebulaTemplate = require('opennebula/template'); var Notifier = require('utils/notifier'); var WizardFields = require('utils/wizard-fields'); - var TemplateUtils = require('utils/template-utils'); var UserInputs = require('utils/user-inputs'); /* @@ -196,12 +195,6 @@ define(function(require) { $.extend( tmp_json, WizardFields.retrieve($("#"+div_id, context)) ); - if (role.elasticity_policies != undefined){ - $.each(role.elasticity_policies, function(i, pol){ - pol.expression = TemplateUtils.htmlDecode(pol.expression); - }); - } - role.user_inputs_values = tmp_json; extra_info.merge_template.roles.push(role); diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js index b27a97fb30..65e218f6b3 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js @@ -22,7 +22,6 @@ define(function(require) { var Locale = require('utils/locale'); var RenameTr = require('utils/panel/rename-tr'); var PermissionsTable = require('utils/panel/permissions-table'); - var TemplateUtils = require('utils/template-utils'); /* TEMPLATES @@ -81,7 +80,7 @@ define(function(require) { case "vnet_id": $.each(that.element.TEMPLATE.BODY.roles, function(index, value){ if (value.vm_template_contents){ - var reg = new RegExp("\\$"+TemplateUtils.htmlDecode(key)+"\\b"); + var reg = new RegExp("\\$"+key+"\\b"); if(reg.exec(value.vm_template_contents) != null){ roles_using_net.push(value.name); diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js index 278f0942f8..dff210958d 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js @@ -19,7 +19,6 @@ define(function(require) { var Locale = require('utils/locale'); var Tips = require('utils/tips'); var TemplatesTable = require('tabs/templates-tab/datatable'); - var TemplateUtils = require('utils/template-utils'); var TemplateHTML = require('hbs!./role-tab/html'); var TemplateElasticityRowHTML = require('hbs!./role-tab/elasticity-row'); @@ -182,10 +181,10 @@ define(function(require) { } function _fill(context, value, network_names) { - $("#role_name", context).val(TemplateUtils.htmlDecode(value.name)); + $("#role_name", context).val(value.name); $("#role_name", context).change(); - $("#cardinality", context).val(TemplateUtils.htmlDecode(value.cardinality)); + $("#cardinality", context).val(value.cardinality); this.templatesTable.selectResourceTableSelect({ids : value.vm_template}); @@ -198,14 +197,14 @@ define(function(require) { } }); - $(".vm_template_contents", context).val(TemplateUtils.htmlDecode(value.vm_template_contents)); + $(".vm_template_contents", context).val(value.vm_template_contents); } $("select[name='shutdown_action_role']", context).val(value.shutdown_action); - $("#min_vms", context).val(TemplateUtils.htmlDecode(value.min_vms)); - $("#max_vms", context).val(TemplateUtils.htmlDecode(value.max_vms)); - $("#cooldown", context).val(TemplateUtils.htmlDecode(value.cooldown)); + $("#min_vms", context).val(value.min_vms); + $("#max_vms", context).val(value.max_vms); + $("#cooldown", context).val(value.cooldown); if (value['elasticity_policies'].length > 0 || value['scheduled_policies'].length > 0) { @@ -219,14 +218,14 @@ define(function(require) { $.each(value['elasticity_policies'], function(){ $("#tf_btn_elas_policies", context).click(); var td = $("#elasticity_policies_tbody tr", context).last(); - $("#type" ,td).val(TemplateUtils.htmlDecode(this['type'])); + $("#type" ,td).val(this['type']); $("#type" ,td).change(); - $("#adjust" ,td).val(TemplateUtils.htmlDecode(this['adjust'] )); - $("#min_adjust_step" ,td).val(TemplateUtils.htmlDecode(this['min_adjust_step'] || "")); - $("#expression" ,td).val(TemplateUtils.htmlDecode(this.expression)); - $("#period_number" ,td).val(TemplateUtils.htmlDecode(this['period_number'] || "")); - $("#period" ,td).val(TemplateUtils.htmlDecode(this['period'] || "" )); - $("#cooldown" ,td).val(TemplateUtils.htmlDecode(this['cooldown'] || "" )); + $("#adjust" ,td).val(this['adjust'] ); + $("#min_adjust_step" ,td).val(this['min_adjust_step'] || ""); + $("#expression" ,td).val(this.expression); + $("#period_number" ,td).val(this['period_number'] || ""); + $("#period" ,td).val(this['period'] || "" ); + $("#cooldown" ,td).val(this['cooldown'] || "" ); }); } @@ -234,17 +233,17 @@ define(function(require) { $.each(value['scheduled_policies'], function(){ $("#tf_btn_sche_policies", context).click(); var td = $("#scheduled_policies_tbody tr", context).last(); - $("#type", td).val(TemplateUtils.htmlDecode(this['type'])); + $("#type", td).val(this['type']); $("#type" ,td).change(); - $("#adjust", td).val(TemplateUtils.htmlDecode(this['adjust'] )); - $("#min_adjust_step", td).val(TemplateUtils.htmlDecode(this['min_adjust_step'] || "")); + $("#adjust", td).val(this['adjust'] ); + $("#min_adjust_step", td).val(this['min_adjust_step'] || ""); if (this['start_time']) { $("#time_format", td).val('start_time'); - $("#time", td).val(TemplateUtils.htmlDecode(this['start_time'])); + $("#time", td).val(this['start_time']); } else if (this['recurrence']) { $("#time_format", td).val('recurrence'); - $("#time", td).val(TemplateUtils.htmlDecode(this['recurrence'])); + $("#time", td).val(this['recurrence']); } }); } diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js index 6059054d03..5ea0b76765 100644 --- a/src/sunstone/public/app/tabs/provision-tab.js +++ b/src/sunstone/public/app/tabs/provision-tab.js @@ -768,14 +768,14 @@ define(function(require) { var li = $('