diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-10-29 10:51:31 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-29 10:51:31 +1300 |
| commit | 854476dcd9bb9b3b48d297cb7369cfe719c492f9 (patch) | |
| tree | fc591e0ebfd98beb287ab8d5332109a0ada7a7ea /web/app/Application.js | |
| parent | f6915ca3bf4e8c2d9df5eb4cd5283614d4dd747e (diff) | |
| parent | 6bcc6ab2a9cd097e543ede5ee520034221045b3e (diff) | |
| download | trackermap-web-854476dcd9bb9b3b48d297cb7369cfe719c492f9.tar.gz trackermap-web-854476dcd9bb9b3b48d297cb7369cfe719c492f9.tar.bz2 trackermap-web-854476dcd9bb9b3b48d297cb7369cfe719c492f9.zip | |
Merge pull request #308 from Abyss777/live_route
Implement live routes
Diffstat (limited to 'web/app/Application.js')
| -rw-r--r-- | web/app/Application.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/web/app/Application.js b/web/app/Application.js index be75a609..743f8b11 100644 --- a/web/app/Application.js +++ b/web/app/Application.js @@ -106,6 +106,14 @@ Ext.define('Traccar.Application', { } }, + getAttributePreference: function (key, defaultValue) { + if (this.getServer().get('forceSettings')) { + return this.getServer().get('attributes')[key] || this.getUser().get('attributes')[key] || defaultValue; + } else { + return this.getUser().get('attributes')[key] || this.getServer().get('attributes')[key] || defaultValue; + } + }, + showError: function (response) { var data; if (Ext.isString(response)) { |