From 9977a6f331583e9d5d702a10b2f8f37910bf98bc Mon Sep 17 00:00:00 2001 From: Frederick Borges Date: Mon, 18 Jan 2021 15:45:50 +0100 Subject: [PATCH] F #5035: Automatic deletion service (#657) Signed-off-by: Frederick Borges --- .../app/tabs/oneflow-services-tab/form-panels/update.js | 1 + .../tabs/oneflow-services-tab/form-panels/update/html.hbs | 8 ++++++++ .../app/tabs/oneflow-templates-tab/form-panels/create.js | 4 ++++ .../oneflow-templates-tab/form-panels/create/wizard.hbs | 8 ++++++++ 4 files changed, 21 insertions(+) diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update.js b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update.js index 2318777448..0bc95a3489 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update.js @@ -160,6 +160,7 @@ define(function(require) { $('select[name="deployment"]', context).val(element.TEMPLATE.BODY.deployment); $("select[name='shutdown_action_service']", context).val(element.TEMPLATE.BODY.shutdown_action); $("input[name='ready_status_gate']", context).prop("checked",element.TEMPLATE.BODY.ready_status_gate || false); + $("input[name='automatic_deletion']", context).prop("checked",element.TEMPLATE.BODY.automatic_deletion || false); // Remove role tabs $("#roles_tabs i.remove-tab", context).trigger("click"); diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update/html.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update/html.hbs index eccd21cd65..03ff1da021 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update/html.hbs @@ -101,6 +101,14 @@ +
+
+ + +
+
{{/advancedSection}}
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 3ae2bf33ef..4a75613f8a 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 @@ -261,6 +261,7 @@ define(function(require) { var deployment = $('select[name="deployment"]', context).val(); var shutdown_action_service = $('select[name="shutdown_action_service"]', context).val(); var ready_status_gate = $('input[name="ready_status_gate"]', context).prop("checked"); + var automatic_deletion = $('input[name="automatic_deletion"]', context).prop("checked"); var custom_attrs = {}; var network_attrs = {}; @@ -317,6 +318,8 @@ define(function(require) { json_template['ready_status_gate'] = ready_status_gate; + json_template['automatic_deletion'] = automatic_deletion; + // add labels var currentInfo = Sunstone.getElementRightInfo(TAB_ID) if ( @@ -381,6 +384,7 @@ define(function(require) { $('select[name="deployment"]', context).val(element.TEMPLATE.BODY.deployment); $("select[name='shutdown_action_service']", context).val(element.TEMPLATE.BODY.shutdown_action); $("input[name='ready_status_gate']", context).prop("checked",element.TEMPLATE.BODY.ready_status_gate || false); + $("input[name='automatic_deletion']", context).prop("checked",element.TEMPLATE.BODY.automatic_deletion || false); $(".service_networks i.remove-tab", context).trigger("click"); diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs index f1d30c287a..b3849b8ab7 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs @@ -100,6 +100,14 @@ +
+
+ + +
+
{{/advancedSection}}