From c46d1c22e92d5a76229eb0b3a60f9b7ddffd96c7 Mon Sep 17 00:00:00 2001
From: Manuel Munz <freifunk@somakoma.de>
Date: Wed, 9 Jan 2013 18:39:29 +0000
Subject: [PATCH] admin-full: Fix javascript error when no proto select box is
 shown, add hint to install iputils-traceroute6 for ipv6 traceroutes

---
 modules/admin-full/luasrc/view/admin_network/diagnostics.htm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
index 48825629c..5794a433e 100644
--- a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -78,8 +78,10 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 					<option value="" selected="selected"><%:IPv4%></option>
 					<option value="6"><%:IPv6%></option>
 				</select>
-				<% end %>
 				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping, this.form.ping_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
+				<% end %>
 			</div>
 
 			<div style="width:33%; float:left">
@@ -89,8 +91,14 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 					<option value="" selected="selected"><%:IPv4%></option>
 					<option value="6"><%:IPv6%></option>
 				</select>
-				<% end %>
 				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute, this.form.traceroute_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
+				<% end %>
+				<% if not has_traceroute6 then %>
+					<p>&nbsp;</p>
+					<p><%:Install iputils-traceroute6 for IPv6 traceroute%></p>
+				<% end %>
 			</div>
 
 			<div style="width:33%; float:left;">
-- 
2.11.0