summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-03-03 21:30:32 +0100
committerJo-Philipp Wich <jo@mein.io>2020-03-03 21:30:32 +0100
commitd5f30d335ff0651a3291e350602cba7409cf1e4a (patch)
treed26953e39e5d687fe3e7b91d3a276ebb0b9b7a41 /modules/luci-base
parent890dcac2de7b1d6bc6768c69ea7129d27a809ef9 (diff)
luci-base: network.js: gracefully handle deleteConfiguration() rejects
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base')
-rw-r--r--modules/luci-base/htdocs/luci-static/resources/network.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 3c5530bded..796b613bee 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -1021,6 +1021,8 @@ Network = L.Class.extend(/** @lends LuCI.Network.prototype */ {
return L.firewall.deleteNetwork(name).then(function() { return true });
return true;
+ }).catch(function() {
+ return false;
});
}
@@ -2657,7 +2659,8 @@ Protocol = L.Class.extend(/** @lends LuCI.Network.Protocol.prototype */ {
* @returns {*|Promise<*>}
* This function may return a promise which is awaited before the rest of
* the configuration is removed. Any non-promise return value and any
- * resolved promise value is ignored.
+ * resolved promise value is ignored. If the returned promise is rejected,
+ * the interface removal will be aborted.
*/
deleteConfiguration: function() {}
});