From bf25765406456a42ea7d619466e914277cbe479b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 19 Dec 2012 10:11:03 +0000 Subject: modules/admin-full: fix "unsupported protocol" vs. "no interface assigned" errors for protocols without ifname property, e.g. 6in4 --- .../luasrc/view/admin_network/iface_overview.htm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'modules/admin-full/luasrc/view') diff --git a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm index 1312b4c16d..4be062985a 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm @@ -176,14 +176,6 @@ You may obtain a copy of the License at d.innerHTML = html; } - else if (d && !ifc.ifname) - { - d.innerHTML = String.format( - '<%:Network without interfaces.%>
' + - '?tab.network.%s=physical"><%:Assign interfaces...%>', - ifc.name, ifc.name - ); - } else if (d && !ifc.proto) { var e = document.getElementById(ifc.id + '-ifc-edit'); @@ -196,6 +188,14 @@ You may obtain a copy of the License at '<%=luci.dispatcher.build_url("admin/system/packages")%>?query=luci-proto&display=available' ); } + else if (d && !ifc.ifname) + { + d.innerHTML = String.format( + '<%:Network without interfaces.%>
' + + '?tab.network.%s=physical"><%:Assign interfaces...%>', + ifc.name, ifc.name + ); + } else if (d) { d.innerHTML = '<%:Interface not present or not connected yet.%>'; -- cgit v1.2.3