router.html: Fix code flow to provide JSON without reading stats

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

ffmap/web/application.py

@@ -140,6 +140,11 @@ def router_info(dbid):
 			router["events"] = mysql.fetchall("""SELECT * FROM router_events WHERE router = %s""",(dbid,))
 			router["events"] = mysql.utcawaretuple(router["events"],"time")
 			
+			## Create json with all data except stats
+			if request.args.get('json', None) != None:
+				mysql.close()
+				return Response(bson2json(router, sort_keys=True, indent=4), mimetype='application/json')
+			
 			router["stats"] = mysql.fetchall("""SELECT * FROM router_stats WHERE router = %s""",(dbid,))
 			for s in router["stats"]:
 				s["time"] = mysql.utcawareint(s["time"])
@@ -208,21 +213,16 @@ def router_info(dbid):
 			mysql.close()
 			return "Router not found"
 		
-		if request.args.get('json', None) != None:
+		return render_template("router.html",
-			del router["stats"]
+			router = router,
-			#FIXME: Only as admin
+			mac = mac,
-			return Response(bson2json(router, sort_keys=True, indent=4), mimetype='application/json')
+			tileurls = tileurls,
-		else:
+			netifstats = netiffetch,
-			return render_template("router.html",
+			neighstats = neighfetch,
-				router = router,
+			gwstats = gwfetch,
-				mac = mac,
+			authuser = is_authorized(router["user"], session),
-				tileurls = tileurls,
+			authadmin = session.get('admin')
-				netifstats = netiffetch,
+			)
-				neighstats = neighfetch,
-				gwstats = gwfetch,
-				authuser = is_authorized(router["user"], session),
-				authadmin = session.get('admin')
-				)
 	except Exception as e:
 		writelog(CONFIG["debug_dir"] + "/fail_router.txt", str(e))
 		import traceback