From c2e6902ada656a7b26cee3baeaec65884e229780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 15 Sep 2016 17:47:37 +0200
Subject: [PATCH] B #4782: Fix NaN cost, remove 'create a new service' button
---
src/sunstone/public/app/tabs/provision-tab.js | 18 ++++++++++++------
.../app/tabs/provision-tab/flows/create.hbs | 2 +-
.../app/tabs/provision-tab/flows/list.js | 9 +--------
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js
index fa4509af5e..4b5d979edc 100644
--- a/src/sunstone/public/app/tabs/provision-tab.js
+++ b/src/sunstone/public/app/tabs/provision-tab.js
@@ -127,7 +127,9 @@ define(function(require) {
var cost = OpenNebula.Template.cost(template_json);
- if ((cost != 0) && Config.isFeatureEnabled("showback")) {
+ var has_cost = (cost != 0) && Config.isFeatureEnabled("showback");
+
+ if (has_cost) {
$(".provision_create_service_cost_div", context).show();
$(".provision_create_service_cost_div", context).data("cost", cost);
@@ -150,11 +152,15 @@ define(function(require) {
$( ".cardinality_slider_div", context).show();
$( ".cardinality_no_slider_div", context).hide();
- $( ".cardinality_slider_div", context).on("input", 'input', function() {
- var cost_value = $(".provision_create_service_cost_div", context).data("cost")*$(this).val();
- $(".cost_value", context).html(cost_value.toFixed(2));
- _calculateFlowCost();
- });
+ $( ".cardinality_slider_div", context).off("input");
+
+ if (has_cost) {
+ $( ".cardinality_slider_div", context).on("input", 'input', function() {
+ var cost_value = $(".provision_create_service_cost_div", context).data("cost")*$(this).val();
+ $(".cost_value", context).html(cost_value.toFixed(2));
+ _calculateFlowCost();
+ });
+ }
} else {
$( ".cardinality_slider_div", context).hide();
$( ".cardinality_no_slider_div", context).show();
diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs b/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs
index d095d7b0e8..e7b4f64e3c 100644
--- a/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs
@@ -44,7 +44,7 @@
<span class="selected_template">
<span class="provision-logo selected_template_logo"></span>
<span class="selected_template_name"></span>
- <span class="has-tip"> <i class="fa fa-pencil"/></span>
+ <span> <i class="fa fa-pencil"/></span>
</span>
</a>
<div id="provision_dd_flow_template" class="provision_select_flow_template accordion-content" data-tab-content>
diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/list.js b/src/sunstone/public/app/tabs/provision-tab/flows/list.js
index e0f51d8062..a7c15be184 100644
--- a/src/sunstone/public/app/tabs/provision-tab/flows/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/flows/list.js
@@ -151,17 +151,10 @@ define(function(require) {
'<br>'+
'<br>'+
'<span>'+
- Locale.tr("Looks like you don't have any Service. Click the button below to get started")+
+ Locale.tr("There are no Services")+
'</span>'+
'<br>'+
'<br>'+
- '<div class="row">'+
- '<div class="large-6 large-centered columns">'+
- '<a href"#" class="medium large-12 button radius provision_create_flow_button"">'+Locale.tr("Create a new Service")+'</a>'+
- '</div>'+
- '</div>'+
- '<br>'+
- '<br>'+
'</div>');
} else {
$(".provision_flows_table", context).html('<div class="provision_flows_ul large-up-3 medium-up-3 small-up-1"></div>');