aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-04-18 09:01:50 +0500
committerAbyss777 <abyss@fox5.ru>2017-04-18 09:01:50 +0500
commit6c8e4716489bc5d05a0c7794ee1cee342de417e3 (patch)
tree07e5f41ac1629633df55819bb2c93b3fda384b0b /web/app
parent22b764a71a450e4f4e8ad1a0439cf708e6bcd952 (diff)
downloadtrackermap-web-6c8e4716489bc5d05a0c7794ee1cee342de417e3.tar.gz
trackermap-web-6c8e4716489bc5d05a0c7794ee1cee342de417e3.tar.bz2
trackermap-web-6c8e4716489bc5d05a0c7794ee1cee342de417e3.zip
Remove shared prefix
Diffstat (limited to 'web/app')
-rw-r--r--web/app/store/DeviceAttributes.js14
-rw-r--r--web/app/store/GeofenceAttributes.js2
-rw-r--r--web/app/store/GroupAttributes.js10
-rw-r--r--web/app/store/ServerAttributes.js8
-rw-r--r--web/app/store/UserAttributes.js24
-rw-r--r--web/app/view/dialog/AttributeController.js4
6 files changed, 31 insertions, 31 deletions
diff --git a/web/app/store/DeviceAttributes.js b/web/app/store/DeviceAttributes.js
index 341a7691..a4303546 100644
--- a/web/app/store/DeviceAttributes.js
+++ b/web/app/store/DeviceAttributes.js
@@ -22,31 +22,31 @@ Ext.define('Traccar.store.DeviceAttributes', {
data: [{
key: 'speedLimit',
- name: Strings.sharedAttributeSpeedLimit,
+ name: Strings.attributeSpeedLimit,
type: 'number'
}, {
key: 'report.ignoreOdometer',
- name: Strings.sharedAttributeReportIgnoreOdometer,
+ name: Strings.attributeReportIgnoreOdometer,
type: 'boolean'
}, {
key: 'maintenance.start',
- name: Strings.sharedAttributeMaintenanceStart,
+ name: Strings.attributeMaintenanceStart,
type: 'number'
}, {
key: 'maintenance.interval',
- name: Strings.sharedAttributeMaintenanceInterval,
+ name: Strings.attributeMaintenanceInterval,
type: 'number'
}, {
key: 'web.reportColor',
- name: Strings.sharedAttributeWebReportColor,
+ name: Strings.attributeWebReportColor,
type: 'color'
}, {
key: 'devicePassword',
- name: Strings.sharedAttributeDevicePassword,
+ name: Strings.attributeDevicePassword,
type: 'string'
}, {
key: 'processing.copyAttributes',
- name: Strings.sharedAttributeProcessingCopyAttributes,
+ name: Strings.attributeProcessingCopyAttributes,
type: 'string'
}]
});
diff --git a/web/app/store/GeofenceAttributes.js b/web/app/store/GeofenceAttributes.js
index d8c8bb9f..9034b3f3 100644
--- a/web/app/store/GeofenceAttributes.js
+++ b/web/app/store/GeofenceAttributes.js
@@ -22,7 +22,7 @@ Ext.define('Traccar.store.GeofenceAttributes', {
data: [{
key: 'color',
- name: Strings.sharedAttributeColor,
+ name: Strings.attributeColor,
type: 'color'
}]
});
diff --git a/web/app/store/GroupAttributes.js b/web/app/store/GroupAttributes.js
index 5ef2aa0a..35caa8c7 100644
--- a/web/app/store/GroupAttributes.js
+++ b/web/app/store/GroupAttributes.js
@@ -22,23 +22,23 @@ Ext.define('Traccar.store.GroupAttributes', {
data: [{
key: 'speedLimit',
- name: Strings.sharedAttributeSpeedLimit,
+ name: Strings.attributeSpeedLimit,
type: 'number'
}, {
key: 'report.ignoreOdometer',
- name: Strings.sharedAttributeReportIgnoreOdometer,
+ name: Strings.attributeReportIgnoreOdometer,
type: 'boolean'
}, {
key: 'maintenance.start',
- name: Strings.sharedAttributeMaintenanceStart,
+ name: Strings.attributeMaintenanceStart,
type: 'number'
}, {
key: 'maintenance.interval',
- name: Strings.sharedAttributeMaintenanceInterval,
+ name: Strings.attributeMaintenanceInterval,
type: 'number'
}, {
key: 'processing.copyAttributes',
- name: Strings.sharedAttributeProcessingCopyAttributes,
+ name: Strings.attributeProcessingCopyAttributes,
type: 'string'
}]
});
diff --git a/web/app/store/ServerAttributes.js b/web/app/store/ServerAttributes.js
index 34431423..71705e04 100644
--- a/web/app/store/ServerAttributes.js
+++ b/web/app/store/ServerAttributes.js
@@ -22,19 +22,19 @@ Ext.define('Traccar.store.ServerAttributes', {
data: [{
key: 'speedLimit',
- name: Strings.sharedAttributeSpeedLimit,
+ name: Strings.attributeSpeedLimit,
type: 'number'
}, {
key: 'maintenance.start',
- name: Strings.sharedAttributeMaintenanceStart,
+ name: Strings.attributeMaintenanceStart,
type: 'number'
}, {
key: 'maintenance.interval',
- name: Strings.sharedAttributeMaintenanceInterval,
+ name: Strings.attributeMaintenanceInterval,
type: 'number'
}, {
key: 'web.liveRouteLength',
- name: Strings.sharedAttributeWebLiveRouteLength,
+ name: Strings.attributeWebLiveRouteLength,
type: 'number',
allowDecimals: false
}]
diff --git a/web/app/store/UserAttributes.js b/web/app/store/UserAttributes.js
index f286d1b9..8649eb8b 100644
--- a/web/app/store/UserAttributes.js
+++ b/web/app/store/UserAttributes.js
@@ -22,54 +22,54 @@ Ext.define('Traccar.store.UserAttributes', {
data: [{
key: 'mail.smtp.host',
- name: Strings.sharedAttributeMailSmtpHost,
+ name: Strings.attributeMailSmtpHost,
type: 'string'
}, {
key: 'mail.smtp.port',
- name: Strings.sharedAttributeMailSmtpPort,
+ name: Strings.attributeMailSmtpPort,
type: 'number',
allowDecimals: false,
minValue: 1,
maxValue: 65535
}, {
key: 'mail.smtp.starttls.enable',
- name: Strings.sharedAttributeMailSmtpStarttlsEnable,
+ name: Strings.attributeMailSmtpStarttlsEnable,
type: 'boolean'
}, {
key: 'mail.smtp.starttls.required',
- name: Strings.sharedAttributeMailSmtpStarttlsRequired,
+ name: Strings.attributeMailSmtpStarttlsRequired,
type: 'boolean'
}, {
key: 'mail.smtp.ssl.enable',
- name: Strings.sharedAttributeMailSmtpSslEnable,
+ name: Strings.attributeMailSmtpSslEnable,
type: 'boolean'
}, {
key: 'mail.smtp.ssl.trust',
- name: Strings.sharedAttributeMailSmtpSslTrust,
+ name: Strings.attributeMailSmtpSslTrust,
type: 'string'
}, {
key: 'mail.smtp.ssl.protocols',
- name: Strings.sharedAttributeMailSmtpSslProtocols,
+ name: Strings.attributeMailSmtpSslProtocols,
type: 'string'
}, {
key: 'mail.smtp.from',
- name: Strings.sharedAttributeMailSmtpFrom,
+ name: Strings.attributeMailSmtpFrom,
type: 'string'
}, {
key: 'mail.smtp.auth',
- name: Strings.sharedAttributeMailSmtpAuth,
+ name: Strings.attributeMailSmtpAuth,
type: 'boolean'
}, {
key: 'mail.smtp.username',
- name: Strings.sharedAttributeMailSmtpUsername,
+ name: Strings.attributeMailSmtpUsername,
type: 'string'
}, {
key: 'mail.smtp.password',
- name: Strings.sharedAttributeMailSmtpPassword,
+ name: Strings.attributeMailSmtpPassword,
type: 'string'
}, {
key: 'web.liveRouteLength',
- name: Strings.sharedAttributeWebLiveRouteLength,
+ name: Strings.attributeWebLiveRouteLength,
type: 'number',
allowDecimals: false
}]
diff --git a/web/app/view/dialog/AttributeController.js b/web/app/view/dialog/AttributeController.js
index ca1436fd..da5205b4 100644
--- a/web/app/view/dialog/AttributeController.js
+++ b/web/app/view/dialog/AttributeController.js
@@ -53,8 +53,8 @@ Ext.define('Traccar.view.dialog.AttributeController', {
},
onNameChange: function (combobox, newValue) {
- var type, config, valueField = this.lookupReference('valueField'),
- attribute = combobox.getStore().getById(newValue);
+ var type, config, attribute, valueField = this.lookupReference('valueField');
+ attribute = combobox.getStore().getById(newValue);
if (attribute) {
type = attribute.get('type');
config = Ext.clone(this.defaultFieldConfig);