aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web/app/AttributeFormatter.js8
-rw-r--r--web/app/view/ReportController.js8
2 files changed, 8 insertions, 8 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index a6f6dd91..d3c2812f 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -47,8 +47,8 @@ Ext.define('Traccar.AttributeFormatter', {
return (hours + ' ' + Strings.sharedHourAbbreviation + ' ' + minutes + ' ' + Strings.sharedMinuteAbbreviation);
},
- deviceNameFormatter: function (value) {
- return Ext.getStore('Devices').findRecord('id', value).get('name');
+ deviceIdFormatter: function (value) {
+ return Ext.getStore('Devices').getById(value).get('name');
},
defaultFormatter: function (value) {
@@ -82,8 +82,8 @@ Ext.define('Traccar.AttributeFormatter', {
return this.hoursFormatter;
} else if (key === 'duration') {
return this.durationFormatter;
- } else if (key === 'deviceName') {
- return this.deviceNameFormatter;
+ } else if (key === 'deviceId') {
+ return this.deviceIdFormatter;
} else {
return this.defaultFormatter;
}
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 85cdb686..775394d0 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -227,7 +227,7 @@ Ext.define('Traccar.view.ReportController', {
routeColumns: [{
text: Strings.reportDeviceName,
dataIndex: 'deviceId',
- renderer: Traccar.AttributeFormatter.getFormatter('deviceName')
+ renderer: Traccar.AttributeFormatter.getFormatter('deviceId')
}, {
text: Strings.positionValid,
dataIndex: 'valid',
@@ -267,7 +267,7 @@ Ext.define('Traccar.view.ReportController', {
}, {
text: Strings.reportDeviceName,
dataIndex: 'deviceId',
- renderer: Traccar.AttributeFormatter.getFormatter('deviceName')
+ renderer: Traccar.AttributeFormatter.getFormatter('deviceId')
}, {
text: Strings.sharedType,
dataIndex: 'type',
@@ -288,7 +288,7 @@ Ext.define('Traccar.view.ReportController', {
summaryColumns: [{
text: Strings.reportDeviceName,
dataIndex: 'deviceId',
- renderer: Traccar.AttributeFormatter.getFormatter('deviceName')
+ renderer: Traccar.AttributeFormatter.getFormatter('deviceId')
}, {
text: Strings.sharedDistance,
dataIndex: 'distance',
@@ -310,7 +310,7 @@ Ext.define('Traccar.view.ReportController', {
tripsColumns: [{
text: Strings.reportDeviceName,
dataIndex: 'deviceId',
- renderer: Traccar.AttributeFormatter.getFormatter('deviceName')
+ renderer: Traccar.AttributeFormatter.getFormatter('deviceId')
}, {
text: Strings.reportStartTime,
dataIndex: 'startTime',