[PATCH 1/2] Bug #265 fix: Avoid remove 'default' storagepool
This patch disables the "undefine" button if the storagepool is the 'default'. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 169e32a..70ea9a3 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -113,6 +113,8 @@ kimchi.storageBindClick = function() { var deleteButton = storage_action.find('.pool-delete'); if ('active' === deleteButton.data('stat')) { deleteButton.attr('disabled', 'disabled'); + } else if ('default' === $(this).data('name')) { + deleteButton.attr('disabled', 'disabled'); } else { deleteButton.removeAttr('disabled'); } -- 1.8.1.4
This patch disables the "Remove" button if the network is the 'default'. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index f7b7eed..5b718a2 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -70,8 +70,8 @@ kimchi.getNetworkItemHtml = function(network) { addrSpace : network.addrSpace, startClass : network.state === "up" ? "hide-action-item" : "", stopClass : network.state === "down" ? "hide-action-item" : "", - deleteClass : network.state === "up" ? "ui-state-disabled" : "", - deleteDisabled: network.state === "up" ? "disabled" : "" + deleteClass : (network.state === "up" || network.name === "default") ? "ui-state-disabled" : "", + deleteDisabled: (network.state === "up" || network.name === "default") ? "disabled" : "" }); return networkItem; }; @@ -98,8 +98,10 @@ kimchi.addNetworkActions = function(network) { kimchi.toggleNetwork(network.name, false, function() { $("[nwAct='start']", menu).removeClass("hide-action-item"); $("[nwAct='stop']", menu).addClass("hide-action-item"); - $("[nwAct='delete']", menu).removeClass("ui-state-disabled"); - $(":first-child", $("[nwAct='delete']", menu)).removeAttr("disabled"); + if ("default" != network.name) { + $("[nwAct='delete']", menu).removeClass("ui-state-disabled"); + $(":first-child", $("[nwAct='delete']", menu)).removeAttr("disabled"); + } $(".network-state", $("#" + network.name)).switchClass("up", "down"); }); } else if ($(evt.currentTarget).attr("nwAct") === "delete") { -- 1.8.1.4
Hi Rodrigo, As I commented to you, first we need to identify if libvirt allows remove default storage pool and network. If libvirt can work fine without default storage pool/network we need to improve this path and only block deletion when there is a template/vm using the storage pool/network. On 12/19/2013 03:31 PM, Rodrigo Trujillo wrote:
This patch disables the "undefine" button if the storagepool is the 'default'.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 169e32a..70ea9a3 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -113,6 +113,8 @@ kimchi.storageBindClick = function() { var deleteButton = storage_action.find('.pool-delete'); if ('active' === deleteButton.data('stat')) { deleteButton.attr('disabled', 'disabled'); + } else if ('default' === $(this).data('name')) { + deleteButton.attr('disabled', 'disabled'); } else { deleteButton.removeAttr('disabled'); }
participants (2)
-
Aline Manera -
Rodrigo Trujillo