2 files changed, 11 insertions, 11 deletions

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index 07cacb324e..46f1ff4825 100644
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -944,8 +944,8 @@ var CBITypedSection = CBIAbstractSection.extend({
 		    sectionEl = E('div', {
 				'id': 'cbi-%s-%s'.format(config_name, this.sectiontype),
 				'class': 'cbi-section',
-				'data-tab': this.map.tabbed ? this.sectiontype : null,
-				'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null
+				'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null,
+				'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null
 			});
 
 		if (this.title != null && this.title != '')
@@ -1013,8 +1013,8 @@ var CBITableSection = CBITypedSection.extend({
 		    sectionEl = E('div', {
 				'id': 'cbi-%s-%s'.format(config_name, this.sectiontype),
 				'class': 'cbi-section cbi-tblsection',
-				'data-tab': this.map.tabbed ? this.sectiontype : null,
-				'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null
+				'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null,
+				'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null
 			}),
 			tableEl = E('div', {
 				'class': 'table cbi-section-table'
@@ -1211,10 +1211,7 @@ var CBITableSection = CBITypedSection.extend({
 				E('button', {
 					'title': btn_title || _('Delete'),
 					'class': 'cbi-button cbi-button-remove',
-					'click': L.ui.createHandlerFn(this, function(sid, ev) {
-						this.map.data.remove(config_name, sid);
-						return this.map.save(null, true);
-					}, section_id)
+					'click': L.ui.createHandlerFn(this, 'handleRemove', section_id)
 				}, [ btn_title || _('Delete') ])
 			);
 		}
@@ -1506,8 +1503,8 @@ var CBINamedSection = CBIAbstractSection.extend({
 		    sectionEl = E('div', {
 				'id': ucidata ? null : 'cbi-%s-%s'.format(config_name, section_id),
 				'class': 'cbi-section',
-				'data-tab': this.map.tabbed ? this.sectiontype : null,
-				'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null
+				'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null,
+				'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null
 			});
 
 		if (typeof(this.title) === 'string' && this.title !== '')
@@ -1925,6 +1922,7 @@ var CBISectionValue = CBIValue.extend({
 			throw 'Sub section must be a descendent of CBIAbstractSection';
 
 		this.subsection = cbiClass.instantiate(this.varargs(arguments, 4, this.map));
+		this.subsection.parentoption = this;
 	},
 
 	load: function(section_id) {
diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 8432bd16f3..a85e2414b6 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -822,7 +822,9 @@ Network = L.Class.extend({
 	},
 
 	deleteNetwork: function(name) {
-		return Promise.all([ L.require('firewall').catch(function() { return null }), initNetworkState() ]).then(function() {
+		var requireFirewall = Promise.resolve(L.require('firewall')).catch(function() {});
+
+		return Promise.all([ requireFirewall, initNetworkState() ]).then(function() {
 			var uciInterface = uci.get('network', name);
 
 			if (uciInterface != null && uciInterface['.type'] == 'interface') {