luci-0.10: Merge r7866

diff --git a/modules/freifunk/luasrc/view/freifunk/adminindex.htm b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
index 4eed2aa954a6940827ad7c279167b02465dc2787..4fcc16ccd24c67b48ba5613ac550702410727f5b 100644 (file)
--- a/modules/freifunk/luasrc/view/freifunk/adminindex.htm
+++ b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
@@ -8,6 +8,15 @@ local latitude = uci:get_first ("system", "system", "latitude")
 local longitude = uci:get_first ("system", "system", "longitude")
 local location = uci:get_first ("system", "system", "location")
 local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics")
+local nickname, name, mail
+if not contact then
+       nickname, name, mail = ""
+else
+       nickname = contact.nickname
+       name = contact.name
+       mail = contact.mail
+end
+
 luci.i18n.loadc("freifunk")
 %>
 
@@ -23,7 +32,7 @@ luci.i18n.loadc("freifunk")
 <%end%>
 <p />
 
-<% if not (contact.nickname and contact.name and contact.mail) then%>
+<% if not (nickname and name and mail) then%>
 <div class="error">
        <%:Contact information is incomplete. Please go to%> <a href='<%=contacturl%>'><%:Contact%></a> <%:and fill out all required fields.%>
        <p />