From efbaeb0393df7532dd7865f0e77171209f4e9363 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 8 Oct 2016 16:16:55 +1300
Subject: Option to force server settings

---
 web/app/Application.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'web/app/Application.js')

diff --git a/web/app/Application.js b/web/app/Application.js
index aab9bc8a..4671a829 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -97,7 +97,11 @@ Ext.define('Traccar.Application', {
     },
 
     getPreference: function (key, defaultValue) {
-        return this.getUser().get(key) || this.getServer().get(key) || defaultValue;
+        if (this.getServer().get('forceSettings')) {
+            return this.getServer().get(key) || this.getUser().get(key) || defaultValue;
+        } else {
+            return this.getUser().get(key) || this.getServer().get(key) || defaultValue;
+        }
     },
 
     showError: function (response) {
-- 
cgit v1.2.3