aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2021-09-24 21:41:24 -0500
committerIván Ávalos <avalos@disroot.org>2021-09-24 21:41:24 -0500
commit8ea200832fa869f90d8c4242b13db4fa4d3a193d (patch)
treedf07c0d74db2ba07f7967b8fe3a89d7a42553e45
parentb8bbb84ca42f45e28df583d9a229b9311e8662a2 (diff)
downloadetbsa-traccar-web-8ea200832fa869f90d8c4242b13db4fa4d3a193d.tar.gz
etbsa-traccar-web-8ea200832fa869f90d8c4242b13db4fa4d3a193d.tar.bz2
etbsa-traccar-web-8ea200832fa869f90d8c4242b13db4fa4d3a193d.zip
If SVG is not found for device category, it defaults to 'default'
-rwxr-xr-xdeploy.sh2
-rw-r--r--web/app/DeviceImages.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/deploy.sh b/deploy.sh
index ff472fd..0b840f9 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,5 +2,5 @@
URL=gemini://avalos.me/gemlog
WEB_DIR=./web
SSH_CMD="ssh"
-RSYNC_TO=etbsa:/opt/traccar/web/
+RSYNC_TO=etbsa.net:/opt/traccar/web/
rsync --progress -e "$SSH_CMD" -rvO --delete $WEB_DIR/ $RSYNC_TO
diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js
index af45ce9..9b837e8 100644
--- a/web/app/DeviceImages.js
+++ b/web/app/DeviceImages.js
@@ -22,7 +22,8 @@ Ext.define('Traccar.DeviceImages', {
getImageSvg: function (color, zoom, angle, category) {
var i, info, svg, width, height, rotateTransform, scaleTransform, fill;
- info = Ext.getStore('DeviceImages').findRecord('key', category || 'default', 0, false, false, true);
+ info = Ext.getStore('DeviceImages').findRecord('key', category || 'default', 0, false, false, true) ||
+ Ext.getStore('DeviceImages').findRecord('key', 'default', false, false, true);
svg = Ext.clone(info.get('svg'));
if (!svg) {
svg = this.cloneDocument(info.get('svg'));