aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-13 20:04:10 +1200
committerGitHub <noreply@github.com>2016-07-13 20:04:10 +1200
commit312cc919eb1fc31af512fb4f73d5f1fd65b297b8 (patch)
treed81708404e89294d2075737e9c50231c82a5165a
parent6a63cf732a11df1512071e3777e080627b878bc5 (diff)
parent4414e093d708159d2016ae0fe54087e9fd3cb9d1 (diff)
downloadtrackermap-server-312cc919eb1fc31af512fb4f73d5f1fd65b297b8.tar.gz
trackermap-server-312cc919eb1fc31af512fb4f73d5f1fd65b297b8.tar.bz2
trackermap-server-312cc919eb1fc31af512fb4f73d5f1fd65b297b8.zip
Merge pull request #2108 from Abyss777/master
Fix user attributes saving
-rw-r--r--debug.xml7
-rw-r--r--setup/unix/traccar.xml7
-rw-r--r--setup/windows/traccar.xml7
3 files changed, 12 insertions, 9 deletions
diff --git a/debug.xml b/debug.xml
index 227ba7b73..02c2ec808 100644
--- a/debug.xml
+++ b/debug.xml
@@ -112,8 +112,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'>
@@ -127,7 +127,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>