aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-19 07:57:52 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-19 07:57:52 +0500
commitd00476f715a617fab3ef4f5cb5c4fff29c533f11 (patch)
treef4ae976ac6eaeeffd42931ad94fadb3f615b64bf /web
parent11826f4b3eac08ad4f52d8c3e6af2b8a0156daee (diff)
downloadetbsa-traccar-web-d00476f715a617fab3ef4f5cb5c4fff29c533f11.tar.gz
etbsa-traccar-web-d00476f715a617fab3ef4f5cb5c4fff29c533f11.tar.bz2
etbsa-traccar-web-d00476f715a617fab3ef4f5cb5c4fff29c533f11.zip
Fix name and use getById
Diffstat (limited to 'web')
-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 a6f6dd9..d3c2812 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 85cdb68..775394d 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',