Merge pull request #4496 from TDT-AG/pr/20201006-luci-mod-system-leds

luci-mod-system: fix uci led option remove callback

1 files changed, 26 insertions, 0 deletions

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js
index 9fe1bff55..23feebc00 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js
@@ -88,6 +88,32 @@ return view.extend({
 				var plugin = plugins[i];
 				plugin.form.addFormOptions(s);
 			}
+
+			var opts = s.getOption();
+
+			var removeIfNoneActive = function(original_remove_fn, section_id) {
+				var isAnyActive = false;
+
+				for (var optname in opts) {
+					if (opts[optname].ucioption != this.ucioption)
+						continue;
+
+					if (!opts[optname].isActive(section_id))
+						continue;
+
+					isAnyActive = true;
+					break;
+				}
+
+				if (!isAnyActive)
+					original_remove_fn.call(this, section_id);
+			};
+
+			for (var optname in opts) {
+				if (!opts[optname].ucioption || optname == opts[optname].ucioption)
+					continue;
+				opts[optname].remove = removeIfNoneActive.bind(opts[optname], opts[optname].remove);
+			}
 		};
 
 		return m.render();