From 41f27b0539be035bc08ccd8e8a1d47c8125f2e83 Mon Sep 17 00:00:00 2001 From: Jorge Lobo <47326048+jloboescalona2@users.noreply.github.com> Date: Tue, 12 May 2020 16:31:54 +0200 Subject: [PATCH] M #~: remove period and number flow (#4714) Signed-off-by: Jorge Lobo --- .../panels/sched-actions/html.hbs | 11 +++------- .../panels/sched_actions.js | 20 ------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched-actions/html.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched-actions/html.hbs index 429ce8b55a..0edc894061 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched-actions/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched-actions/html.hbs @@ -7,23 +7,18 @@ distributed on an "AS IS" BASIS, }} {{! WITHOUT WARRANTIES OR CONDITIONS OF ANY the License for the specific language governing permissions and }} {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} - - - - - +
-
{{tr "New scheduled action"}}:
+
{{tr "Perform an action"}}:
+
- -
diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched_actions.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched_actions.js index 387af15414..31f272bd66 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched_actions.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/sched_actions.js @@ -75,7 +75,6 @@ define(function(require) { Panel.PANEL_ID = PANEL_ID; Panel.prototype.html = _html; Panel.prototype.setup = _setup; - Panel.prototype.onShow = _onShow; return Panel; @@ -150,8 +149,6 @@ define(function(require) { context.off("click", "#add_"+RESOURCE+"_action_json").on("click", "#add_"+RESOURCE+"_action_json", function(){ var new_action = $("select#select_new_action").val(); var role = $("select#role_name").val(); - var period = $("input#period").val(); - var number = $("input#number").val(); var snap_name = $("#snapname").val(); var snap_id = $("#snapid").val(); var disk_id = $("#diskid").val(); @@ -168,12 +165,6 @@ define(function(require) { actionJSON.data.id = that.id; actionJSON.data.action = {perform: new_action}; actionJSON.data.action.params = {}; - if(period!=='' && period!==undefined){ - actionJSON.data.action.params.period = period; - } - if(number!=='' && number!==undefined){ - actionJSON.data.action.params.number = number; - } if(that.actions.includes(new_action)){ var rawData = [disk_id,snap_id,snap_name]; var args = rawData.filter(function (e) {return e;}).join(); @@ -189,15 +180,4 @@ define(function(require) { return false; }); } - - function _onShow(context) { - var deploys = this.data.filter(function(roles){ - return roles && roles.nodes; - }).flatMap(function(node){ - return node.nodes; - }).map(function(nde){ - return nde && nde.deploy_id && nde.vm_info && nde.vm_info.VM && nde.vm_info.VM.NAME ? ""+nde.vm_info.VM.NAME+"" : "" ; - }).join(""); - $("#list_vms_sched_actions").empty().append(deploys); - } });