luci-base: form.js: fix removing just created named GridSection

[project/luci.git] / modules / luci-base / htdocs / luci-static / resources / form.js

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index 90a15175712713891da34491de5dd43e6e7b7208..aae8b3684a0cce56518df5299bfbb9fa74b829c2 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -3042,7 +3042,7 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
                }
 
                return saveTasks
-                       .then(L.bind(this.handleModalCancel, this, modalMap, ev))
+                       .then(L.bind(this.handleModalCancel, this, modalMap, ev, true))
                        .catch(function() {});
        },
 
@@ -3365,20 +3365,19 @@ var CBIGridSection = CBITableSection.extend(/** @lends LuCI.form.GridSection.pro
                var mapNode = this.getPreviousModalMap(),
                    prevMap = mapNode ? dom.findClassInstance(mapNode) : this.map;
 
-               return this.super('handleModalSave', arguments)
-                       .then(function() { delete prevMap.addedSection });
+               return this.super('handleModalSave', arguments);
        },
 
        /** @private */
-       handleModalCancel: function(/* ... */) {
+       handleModalCancel: function(modalMap, ev, isSaving) {
                var config_name = this.uciconfig || this.map.config,
                    mapNode = this.getPreviousModalMap(),
                    prevMap = mapNode ? dom.findClassInstance(mapNode) : this.map;
 
-               if (prevMap.addedSection != null) {
+               if (prevMap.addedSection != null && !isSaving)
                        this.map.data.remove(config_name, prevMap.addedSection);
-                       delete prevMap.addedSection;
-               }
+
+               delete prevMap.addedSection;
 
                return this.super('handleModalCancel', arguments);
        },