From d1d0e7f5b22c8281ccb3900cd1e1e6bb457a579f Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 23 Dec 2014 18:04:23 +0100 Subject: [PATCH] feature #3357: Add option to disable capacity and network selects per template --- .../models/OpenNebulaJSON/TemplateJSON.rb | 11 + .../public/js/plugins/provision-tab.js | 237 +++++++++--------- .../public/js/plugins/templates-tab.js | 43 +++- 3 files changed, 172 insertions(+), 119 deletions(-) diff --git a/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb index 0f5b6d898a..890f875c6d 100644 --- a/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb @@ -90,6 +90,17 @@ module OpenNebulaJSON def instantiate(params=Hash.new) if params['template'] + select_capacity = self['TEMPLATE/SUNSTONE_CAPACITY_SELECT'] + if (select_capacity && select_capacity.upcase == "NO") + params['template'].delete("CPU") + params['template'].delete("MEMORY") + end + + select_network = self['TEMPLATE/SUNSTONE_NETWORK_SELECT'] + if (select_network && select_network.upcase == "NO") + params['template'].delete("NIC") + end + template = template_to_str(params['template']) super(params['vm_name'], params['hold'], template) else diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index 2ae6752188..f6ea290cb5 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -554,16 +554,14 @@ var provision_create_vm = '