From 17f5a899a08b992507b574eeb4047b1f6bfa8629 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 19 Oct 2016 18:35:28 +0500
Subject: - 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
---
 src/org/traccar/reports/Route.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/org/traccar/reports/Route.java')

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);
-- 
cgit v1.2.3