From 5b9c5c6c2f0eeda8f489ad28f890e04c6d4d959a Mon Sep 17 00:00:00 2001 From: juanmont Date: Mon, 21 Nov 2016 15:47:26 +0100 Subject: [PATCH 1/2] removed revert button when the VM is running --- src/sunstone/public/app/tabs/vms-tab/panels/storage.js | 6 ++++++ 1 file changed, 6 insertions(+) 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 12d3c1289e..052abd65d8 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js @@ -474,6 +474,12 @@ define(function(require) { context.off("change", ".snapshot_check_item"); context.on("change", ".snapshot_check_item", function() { var snapshotsSection = $(this).closest('.snapshots'); + if(that.element.STATE == "3"){ + $(".disk_snapshot_revert", snapshotsSection).hide(); + } + else{ + $(".disk_snapshot_revert", snapshotsSection).show(); + } // Unselect other check inputs var checked = $(this).is(':checked'); From f662e04987cf8e31dbfd5fc77e80c8d0260cf9fb Mon Sep 17 00:00:00 2001 From: juanmont Date: Mon, 21 Nov 2016 16:34:06 +0100 Subject: [PATCH 2/2] F #4203 the VM logo image added to: - VM Template info. - VM Templante instantiate. - VM info. --- .../tabs/templates-tab/form-panels/instantiate/templateRow.hbs | 3 +++ .../public/app/tabs/templates-tab/panels/info/html.hbs | 3 +++ src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs index 533b9738df..1b6cdab2c6 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs @@ -22,6 +22,9 @@ {{tr "COST"}} / {{tr "HOUR"}} + + +
diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs index a6e34b7153..4c5acac933 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs @@ -23,6 +23,9 @@ + + + {{tr "ID"}} {{element.ID}} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs index e19be83db1..05c1921b49 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs @@ -23,6 +23,9 @@ + + + {{tr "ID"}} {{element.ID}}