diff options
author | Abyss777 <abyss@fox5.ru> | 2016-10-19 18:35:28 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-10-19 18:35:28 +0500 |
commit | 17f5a899a08b992507b574eeb4047b1f6bfa8629 (patch) | |
tree | 38044c918384b21e9533452d6a408f0935c96a1e /src/org/traccar/reports/Route.java | |
parent | c613143105d9f7c898dd3fb236d683b76cf8a42c (diff) | |
download | trackermap-server-17f5a899a08b992507b574eeb4047b1f6bfa8629.tar.gz trackermap-server-17f5a899a08b992507b574eeb4047b1f6bfa8629.tar.bz2 trackermap-server-17f5a899a08b992507b574eeb4047b1f6bfa8629.zip |
- Filter events on server side
- Use common path for templates
- Filter events about geofences that user do not have access (minor security fix)
- Removed unused function
- Visual templates improvements
Diffstat (limited to 'src/org/traccar/reports/Route.java')
-rw-r--r-- | src/org/traccar/reports/Route.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java index 1bb7b564a..7cefe04a3 100644 --- a/src/org/traccar/reports/Route.java +++ b/src/org/traccar/reports/Route.java @@ -83,9 +83,9 @@ public final class Route { devicesRoutes.add(deviceRoutes); } } - String templatePath = Context.getConfig().getString("report.route.template.excel", - "templates/export/route.xlsx"); - try (InputStream inputStream = new FileInputStream(templatePath)) { + String templatePath = Context.getConfig().getString("report.templatesPath", + "templates/export/"); + try (InputStream inputStream = new FileInputStream(templatePath + "/route.xlsx")) { org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext(); jxlsContext.putVar("devices", devicesRoutes); jxlsContext.putVar("sheetNames", sheetNames); |