Merge remote-tracking branch 'refs/remotes/tananaev/master'

5 files changed, 16 insertions, 11 deletions

diff --git a/debug.xml b/debug.xml
index 60e2c65e8..5c6a59f27 100644
--- a/debug.xml
+++ b/debug.xml
@@ -114,8 +114,8 @@
     </entry>
 
     <entry key='database.insertUser'>
-        INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat)
-        VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat);
+        INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, attributes)
+        VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :attributes);
     </entry>
 
     <entry key='database.updateUser'>
@@ -129,7 +129,8 @@
         latitude = :latitude,
         longitude = :longitude,
         zoom = :zoom,
-        twelveHourFormat = :twelveHourFormat
+        twelveHourFormat = :twelveHourFormat,
+        attributes = :attributes
         WHERE id = :id;
     </entry>
 
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index 767d53d8b..83abb48fd 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -70,8 +70,8 @@
     </entry>
 
     <entry key='database.insertUser'>
-        INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat)
-        VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat);
+        INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, attributes)
+        VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :attributes);
     </entry>
 
     <entry key='database.updateUser'>
@@ -85,7 +85,8 @@
         latitude = :latitude,
         longitude = :longitude,
         zoom = :zoom,
-        twelveHourFormat = :twelveHourFormat
+        twelveHourFormat = :twelveHourFormat,
+        attributes = :attributes
         WHERE id = :id;
     </entry>
 
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 8499bda67..72f04d0a0 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -70,8 +70,8 @@
     </entry>

 

     <entry key='database.insertUser'>

-        INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat)

-        VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat);

+        INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, attributes)

+        VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :attributes);

     </entry>

 

     <entry key='database.updateUser'>

@@ -85,7 +85,8 @@
         latitude = :latitude,

         longitude = :longitude,

         zoom = :zoom,

-        twelveHourFormat = :twelveHourFormat

+        twelveHourFormat = :twelveHourFormat,

+        attributes = :attributes

         WHERE id = :id;

     </entry>

 

diff --git a/web/app/view/AttributesController.js b/web/app/view/AttributesController.js
index 2a9e71849..8e6ab82a4 100644
--- a/web/app/view/AttributesController.js
+++ b/web/app/view/AttributesController.js
@@ -38,6 +38,7 @@ Ext.define('Traccar.view.AttributesController', {
             }
         }
         store.addListener('add', function (store, records, index, eOpts) {
+            var i;
             for (i = 0; i < records.length; i++) {
                 this.getView().record.get('attributes')[records[i].get('name')] = records[i].get('value');
             }
@@ -53,7 +54,8 @@ Ext.define('Traccar.view.AttributesController', {
             }
         }, this);
         store.addListener('remove', function (store, records, index, isMove, eOpts) {
-            for (var i = 0; i < records.length; i++) {
+            var i;
+            for (i = 0; i < records.length; i++) {
                 delete this.getView().record.get('attributes')[records[i].get('name')];
             }
             this.getView().record.dirty = true;
diff --git a/web/app/view/Notifications.js b/web/app/view/Notifications.js
index 996ce3748..5ff5f061f 100644
--- a/web/app/view/Notifications.js
+++ b/web/app/view/Notifications.js
@@ -30,7 +30,7 @@ Ext.define('Traccar.view.Notifications', {
     },
 
     viewConfig: {
-        markDirty:false
+        markDirty: false
     },
 
     columns: [{