From abf9687234ed94dc130cab896355604f2c4115f3 Mon Sep 17 00:00:00 2001 From: Srk Date: Sat, 18 Nov 2017 19:20:09 +0100 Subject: Revert "User defaults when no User is available" This reverts commit ccb2e9e5e0581406963ac63a9d08acb7c2549834. --- src/org/traccar/reports/ReportUtils.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java index 22c7981d8..f6f386e99 100644 --- a/src/org/traccar/reports/ReportUtils.java +++ b/src/org/traccar/reports/ReportUtils.java @@ -61,19 +61,19 @@ public final class ReportUtils { } } - public static String getDistanceUnit(Long userId) { + public static String getDistanceUnit(long userId) { return (String) Context.getPermissionsManager().lookupAttribute(userId, "distanceUnit", "km"); } - public static String getSpeedUnit(Long userId) { + public static String getSpeedUnit(long userId) { return (String) Context.getPermissionsManager().lookupAttribute(userId, "speedUnit", "kn"); } - public static String getVolumeUnit(Long userId) { + public static String getVolumeUnit(long userId) { return (String) Context.getPermissionsManager().lookupAttribute(userId, "volumeUnit", "ltr"); } - public static TimeZone getTimezone(Long userId) { + public static TimeZone getTimezone(long userId) { String timezone = (String) Context.getPermissionsManager().lookupAttribute(userId, "timezone", null); return timezone != null ? TimeZone.getTimeZone(timezone) : TimeZone.getDefault(); } @@ -137,7 +137,7 @@ public final class ReportUtils { return null; } - public static org.jxls.common.Context initializeContext(Long userId) { + public static org.jxls.common.Context initializeContext(long userId) { org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext(); jxlsContext.putVar("distanceUnit", getDistanceUnit(userId)); jxlsContext.putVar("speedUnit", getSpeedUnit(userId)); -- cgit v1.2.3