From a194051e691d83191d0973782ad458a4020808c1 Mon Sep 17 00:00:00 2001 From: abelCoronado93 Date: Mon, 27 Mar 2017 13:02:49 +0200 Subject: [PATCH 1/6] Attach disk | SWAP removed for vCenter templates --- .../form-panels/create/wizard-tabs/storage/disk-tab/html.hbs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs index 479a92e0873..8b02f2d5e77 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs @@ -74,10 +74,13 @@ - +

From ee94c1b465a9902b38c799af92000b842ceb6aa2 Mon Sep 17 00:00:00 2001 From: abelCoronado93 Date: Mon, 27 Mar 2017 14:26:06 +0200 Subject: [PATCH 3/6] Attach disk | SWAP & cowq2 removed for vCenter vms --- src/sunstone/public/app/tabs/vms-tab/panels/storage.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js index 1eb072c0a9e..eee04502bdc 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js @@ -436,6 +436,10 @@ define(function(require) { context.on('click', '#attach_disk', function() { var dialog = Sunstone.getDialog(ATTACH_DISK_DIALOG_ID); dialog.setElement(that.element); + if(that.element.USER_TEMPLATE.HYPERVISOR && that.element.USER_TEMPLATE.HYPERVISOR == 'venter'){ + $('.hypervisor.only_kvm').hide(); + $('.hypervisor.only_vcenter').show(); + } dialog.show(); return false; }); @@ -445,7 +449,6 @@ define(function(require) { context.off('click', '.detachdisk'); context.on('click', '.detachdisk', function() { var disk_id = $(this).parents('tr').attr('disk_id'); - Sunstone.getDialog(CONFIRM_DIALOG_ID).setParams({ //header : headerTabId: TAB_ID, @@ -596,7 +599,7 @@ define(function(require) { return false; }); } - + Tree.setup(context); } From dc79bfdadf990fd84cb1d8f4b229bf7b850df573 Mon Sep 17 00:00:00 2001 From: abelCoronado93 Date: Mon, 27 Mar 2017 15:58:47 +0200 Subject: [PATCH 4/6] VM attach disk | Changed 'Advanced options' for vCenter disks --- .../wizard-tabs/storage/disk-tab/options.hbs | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs index db9f134fee7..f4ea7f4fc00 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs @@ -1,5 +1,5 @@
-
+
-
+
-
+
@@ -45,6 +45,30 @@
+
+ + +
+
+ + +
From b0aefd54944b55916c19150f3ba3e08085c14900 Mon Sep 17 00:00:00 2001 From: abelCoronado93 Date: Mon, 27 Mar 2017 16:44:36 +0200 Subject: [PATCH 5/6] Restyled import image --- .../tabs/images-tab/form-panels/import/html.hbs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs index ab8ee9d3561..263d360330b 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs @@ -31,15 +31,17 @@
-
+
-
- - +
+
+
+ +
From df62cbb52a2f1bc9926858f558f22dce98c5d225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Wed, 29 Mar 2017 14:18:27 +0200 Subject: [PATCH 6/6] Update html.hbs Add missing ; --- .../public/app/tabs/images-tab/form-panels/import/html.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs index 263d360330b..b843babfcec 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs @@ -38,7 +38,7 @@
- + @@ -48,4 +48,4 @@
{{{vCenterImagesHTML}}}
-
\ No newline at end of file +