[PATCH 2/2] Bug #265 fix: Avoid remove 'default' network

[Rodrigo Trujillo]

This patch disables the "Remove" button if the network is the
'default'.

Signed-off-by: Rodrigo Trujillo <rodrigo....@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 af1cc43..78932e6 100644
--- a/ui/js/src/kimchi.network.js
+++ b/ui/js/src/kimchi.network.js
@@ -69,8 +69,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;
};
@@ -97,8 +97,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

[Rodrigo Trujillo]

This patch disables the "undefine" button if the storagepool is the

'default'.

Signed-off-by: Rodrigo Trujillo <rodrigo....@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

[Shu Ming]

2013/12/11 13:15, Rodrigo Trujillo:

I am not sure it is a right fix to treat "default" as a special case. I
think the clean fix should to check if the the storagepool is used by
any third party. If it is in use, the storagepool can not be removed.


> } else {
> deleteButton.removeAttr('disabled');
> }

[Rodrigo Trujillo]

I think "default" is a special case .... because it is added again next
time kimchi is loaded.
Yes, if the storagepool have been used, it should not be removed. I
noticed this. And am planning to fix this too. ( Did not have time
yesterday :] )

>> } else {
>> deleteButton.removeAttr('disabled');
>> }
>

[Daniel Henrique Barboza]

Reviewed-by: Daniel Barboza <dani...@linux.vnet.ibm.com>

[Daniel Henrique Barboza]

Reviewed-by: Daniel Barboza <dani...@linux.vnet.ibm.com>

On 11-12-2013 03:15, Rodrigo Trujillo wrote: