From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 19 Dec 2012 10:11:03 +0000 (+0000)
Subject: modules/admin-full: fix "unsupported protocol" vs. "no interface assigned" errors... 
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=bf25765406456a42ea7d619466e914277cbe479b;hp=d4987d7863baf1071d2c1579c8730cf44538fd45

modules/admin-full: fix "unsupported protocol" vs. "no interface assigned" errors for protocols without ifname property, e.g. 6in4
---

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 1312b4c16..4be062985 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(
-							'<em><%:Network without interfaces.%></em><br />' +
-							'<a href="<%=luci.dispatcher.build_url("admin/network/network/%s")%>?tab.network.%s=physical"><%:Assign interfaces...%></a>',
-								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(
+							'<em><%:Network without interfaces.%></em><br />' +
+							'<a href="<%=luci.dispatcher.build_url("admin/network/network/%s")%>?tab.network.%s=physical"><%:Assign interfaces...%></a>',
+								ifc.name, ifc.name
+						);
+					}
 					else if (d)
 					{
 						d.innerHTML = '<em><%:Interface not present or not connected yet.%></em>';