From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 31 May 2021 12:00:51 +0000 (+0200)
Subject: luci-mod-network: make device selector dependent on protocol (again)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b796bff7a9a3de10964c54500a63c4f7b4b5a0bf;p=project%2Fluci.git

luci-mod-network: make device selector dependent on protocol (again)

This commit effectively reverts the change made with
907b4222f7 ("luci-mod-network: don't hide "Device" on protocol change").

Floating tunnel protocols such as 6in4, plain PPP over modem device,
VPNC etc. do not have any layer 2 device at all, for such protocols the
device selector should be hidden.

Also swap back the incorrect option order introduced with commit
b7f3cf66ca ("luci-mod-network: drop support for *adding* legacy bridges").

Since device depends on proto, it should come after the protocol selection,
not before.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fc12933670ba9efd87a24b6823cf57a666b54c1a)
---

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 fc1e42fa40..11d96eecb3 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
@@ -505,10 +505,6 @@ return view.extend({
 				}, this);
 				o.write = function() {};
 
-				o = s.taboption('general', widgets.DeviceSelect, 'device', _('Device'));
-				o.nobridges = false;
-				o.optional = false;
-				o.network = ifc.getName();
 
 				proto_select = s.taboption('general', form.ListValue, 'proto', _('Protocol'));
 				proto_select.modalonly = true;
@@ -525,6 +521,11 @@ return view.extend({
 						.then(L.bind(this.renderMoreOptionsModal, this, s.section));
 				}, this);
 
+				o = s.taboption('general', widgets.DeviceSelect, 'device', _('Device'));
+				o.nobridges = false;
+				o.optional = false;
+				o.network = ifc.getName();
+
 				o = s.taboption('general', form.Flag, 'auto', _('Bring up on boot'));
 				o.modalonly = true;
 				o.default = o.enabled;
@@ -876,7 +877,6 @@ return view.extend({
 					o = s.children[i];
 
 					switch (o.option) {
-					case 'device':
 					case 'proto':
 					case 'auto':
 					case '_dhcp':
@@ -888,6 +888,7 @@ return view.extend({
 					case 'igmp_snooping':
 					case 'stp':
 					case 'type':
+					case 'device':
 						var deps = [];
 						for (var j = 0; j < protocols.length; j++) {
 							if (!protocols[j].isVirtual()) {