From 147188f6ee7067119746ffc2a505ef8f4eb8943a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 31 May 2021 11:50:56 +0200 Subject: [PATCH] luci-mod-network: fix device dependencies in add interface dialog Commit b7f3cf66ca "luci-mod-network: drop support for *adding* legacy bridges" dropped the protocol dependcies of the ifname/device selector in the add new interface dialog. Re-add the required dependencies and swap the order of the protocol and device inputs while we're at it since latter depends on the former. Fixes: b7f3cf66ca ("luci-mod-network: drop support for *adding* legacy bridges") Signed-off-by: Jo-Philipp Wich --- .../luci-static/resources/view/network/interfaces.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index 54c7b6cb3d..08b1a21855 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -962,15 +962,18 @@ return view.extend({ return true; }; + proto = s2.option(form.ListValue, 'proto', _('Protocol')); + proto.validate = name.validate; + device = s2.option(widgets.DeviceSelect, 'device', _('Device')); device.noaliases = false; device.optional = false; - proto = s2.option(form.ListValue, 'proto', _('Protocol')); - proto.validate = name.validate; - for (var i = 0; i < protocols.length; i++) { proto.value(protocols[i].getProtocol(), protocols[i].getI18n()); + + if (!protocols[i].isVirtual()) + device.depends('proto', protocols[i].getProtocol()); } m2.render().then(L.bind(function(nodes) { -- 2.30.2