diff options
author | Abyss777 <abyss@fox5.ru> | 2017-08-18 11:52:06 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-08-18 11:52:06 +0500 |
commit | 65116928b2b7a8e5e2b70bf490b3225896cf2c71 (patch) | |
tree | af24b231822fb045a7ae4d03e533775285d41e47 /web/app/view/edit/Devices.js | |
parent | 01af5f520e24a33d7e22523d8ed11e9f14a19516 (diff) | |
parent | b3d3c720f34e12e7af83e6be3bd87e304931bbe1 (diff) | |
download | etbsa-traccar-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.gz etbsa-traccar-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.bz2 etbsa-traccar-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.zip |
Merge branch 'master' into disable_vehicle_features
Diffstat (limited to 'web/app/view/edit/Devices.js')
-rw-r--r-- | web/app/view/edit/Devices.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js index c9538c8..4fdcab0 100644 --- a/web/app/view/edit/Devices.js +++ b/web/app/view/edit/Devices.js @@ -111,6 +111,7 @@ Ext.define('Traccar.view.edit.Devices', { if (status) { return Ext.getStore('DeviceStatuses').getById(status).get('color'); } + return null; } }, @@ -165,7 +166,7 @@ Ext.define('Traccar.view.edit.Devices', { for (i = 0; i < value.length; i++) { name = Traccar.AttributeFormatter.geofenceIdFormatter(value[i]); if (name) { - result += name + ((i < value.length - 1) ? ', ' : ''); + result += name + (i < value.length - 1 ? ', ' : ''); } } } @@ -187,6 +188,7 @@ Ext.define('Traccar.view.edit.Devices', { return status.get('name'); } } + return null; } }, { text: Strings.deviceLastUpdate, |