From db5a8d1d94927bada260e83d5e0e661285eb6427 Mon Sep 17 00:00:00 2001 From: juanmont Date: Fri, 7 Apr 2017 11:09:55 +0200 Subject: [PATCH] B #5004 merged of 2 templates, advanced and wizard (#251) --- .../form-panels/create.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) 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 9bb19dd135..12bd2b5de2 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 @@ -18,7 +18,7 @@ define(function(require) { /* DEPENDENCIES */ - + var Notifier = require('utils/notifier'); // require('foundation.tab'); var BaseFormPanel = require('utils/form-panels/form-panel'); var Sunstone = require('sunstone'); @@ -229,23 +229,27 @@ define(function(require) { json_template['ready_status_gate'] = ready_status_gate; + var templateStr = $('textarea#template', $("form#createServiceTemplateFormAdvanced")).val(); + var template_final = TemplateUtils.mergeTemplates(templateJSON, templateStr); if (this.action == "create") { - Sunstone.runAction("ServiceTemplate.create", json_template ); + Sunstone.runAction("ServiceTemplate.create", template_final ); return false; } else if (this.action == "update") { - Sunstone.runAction("ServiceTemplate.update",this.resourceId, JSON.stringify(json_template)); + Sunstone.runAction("ServiceTemplate.update",this.resourceId, JSON.stringify(template_final)); return false; } } function _submitAdvanced(context) { - var json_template = $('textarea#template', context).val(); - + var templateStr = $('textarea#template', context).val(); + var templateJSON = this.retrieve($("form#createServiceTemplateFormWizard")); + var template_final = TemplateUtils.mergeTemplates(templateStr, templateJSON, true); + template_final = TemplateUtils.templateToString(template_final); if (this.action == "create") { - Sunstone.runAction("ServiceTemplate.create", JSON.parse(json_template) ); + Sunstone.runAction("ServiceTemplate.create", JSON.parse(template_final) ); return false; } else if (this.action == "update") { - Sunstone.runAction("ServiceTemplate.update", this.resourceId, json_template); + Sunstone.runAction("ServiceTemplate.update", this.resourceId, template_final); return false; } }