aboutsummaryrefslogtreecommitdiff
path: root/web/app/Application.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-10-08 16:16:55 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-10-08 16:16:55 +1300
commitefbaeb0393df7532dd7865f0e77171209f4e9363 (patch)
tree39c1523d5e89ac2ac40738dbfab369cc23fc5bde /web/app/Application.js
parent58d7f195375a8d32f5260da7d4cea437ad564223 (diff)
downloadtrackermap-web-efbaeb0393df7532dd7865f0e77171209f4e9363.tar.gz
trackermap-web-efbaeb0393df7532dd7865f0e77171209f4e9363.tar.bz2
trackermap-web-efbaeb0393df7532dd7865f0e77171209f4e9363.zip
Option to force server settings
Diffstat (limited to 'web/app/Application.js')
-rw-r--r--web/app/Application.js6
1 files changed, 5 insertions, 1 deletions
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) {