From 172975d792b3da925a48cf69d51428c8be2105e3 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 1 Dec 2016 12:57:59 +0100 Subject: [PATCH] a couple of bug fixes: - fixed sensor detail chart not showing data - fixed? out ouf memory in PowerChalange page - temporary fix for wrong / redirect --- resource/web/js/hal.js | 1 + resource/web/sensor_detail.tmpl | 2 +- src/se/hal/HalServer.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resource/web/js/hal.js b/resource/web/js/hal.js index f49ea49f..61d9dfd5 100755 --- a/resource/web/js/hal.js +++ b/resource/web/js/hal.js @@ -119,5 +119,6 @@ function getChartData(json){ names: labels, type: 'spline', axes: dataYaxis, + unload: true, }; } \ No newline at end of file diff --git a/resource/web/sensor_detail.tmpl b/resource/web/sensor_detail.tmpl index 68a559d8..8cd5f4e8 100755 --- a/resource/web/sensor_detail.tmpl +++ b/resource/web/sensor_detail.tmpl @@ -10,7 +10,7 @@ diff --git a/src/se/hal/HalServer.java b/src/se/hal/HalServer.java index ff3ceb09..8175004b 100755 --- a/src/se/hal/HalServer.java +++ b/src/se/hal/HalServer.java @@ -73,7 +73,7 @@ public class HalServer { HttpServer http = new HttpServer(HalContext.getIntegerProperty("http_port")); http.setDefaultPage(new HttpFilePage(FileUtil.find("resource/web/"))); - http.setPage("/", new HttpRedirectPage("/"+pages.get(0).getId())); + http.setPage("/", new HttpRedirectPage("/map")); http.setPage(HalAlertManager.getInstance().getUrl(), HalAlertManager.getInstance()); for(HalHttpPage page : pages){ http.setPage(page.getId(), page);