From 6c8e4716489bc5d05a0c7794ee1cee342de417e3 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 18 Apr 2017 09:01:50 +0500
Subject: Remove shared prefix

---
 web/app/store/DeviceAttributes.js          | 14 +++++++-------
 web/app/store/GeofenceAttributes.js        |  2 +-
 web/app/store/GroupAttributes.js           | 10 +++++-----
 web/app/store/ServerAttributes.js          |  8 ++++----
 web/app/store/UserAttributes.js            | 24 ++++++++++++------------
 web/app/view/dialog/AttributeController.js |  4 ++--
 6 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'web/app')

diff --git a/web/app/store/DeviceAttributes.js b/web/app/store/DeviceAttributes.js
index 341a769..a430354 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 d8c8bb9..9034b3f 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 5ef2aa0..35caa8c 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 3443142..71705e0 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 f286d1b..8649eb8 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 ca1436f..da5205b 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);
-- 
cgit v1.2.3