diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-14 22:24:17 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 22:24:17 +1300 |
| commit | e85f2a54420aa1299ea70b0bcf4a0c870620a31a (patch) | |
| tree | 6a0ce5ded2fd24e5cf98f5e5f04095a03593105d /setup | |
| parent | b3e2f211c3a3c64c8fa704ba1942970bb97f8eae (diff) | |
| parent | 1b499620810fe6d376a4a72c5ab66b6be2f4af5c (diff) | |
| download | traccar-server-e85f2a54420aa1299ea70b0bcf4a0c870620a31a.tar.gz traccar-server-e85f2a54420aa1299ea70b0bcf4a0c870620a31a.tar.bz2 traccar-server-e85f2a54420aa1299ea70b0bcf4a0c870620a31a.zip | |
Merge pull request #3001 from Abyss777/timezone
Timezone field to User and Server model
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/setup/default.xml b/setup/default.xml index 9fe49edbe..90bdc1973 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -51,6 +51,7 @@ longitude = :longitude, zoom = :zoom, twelveHourFormat = :twelveHourFormat, + timezone = :timezone, attributes = :attributes WHERE id = :id </entry> @@ -65,8 +66,8 @@ </entry> <entry key='database.insertUser'> - INSERT INTO users (name, email, phone, hashedPassword, salt, readonly, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, coordinateFormat, disabled, expirationTime, deviceLimit, userLimit, deviceReadonly, token, attributes) - VALUES (:name, :email, :phone, :hashedPassword, :salt, :readonly, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :coordinateFormat, :disabled, :expirationTime, :deviceLimit, :userLimit, :deviceReadonly, :token, :attributes) + INSERT INTO users (name, email, phone, hashedPassword, salt, readonly, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, coordinateFormat, disabled, expirationTime, deviceLimit, userLimit, deviceReadonly, token, timezone, attributes) + VALUES (:name, :email, :phone, :hashedPassword, :salt, :readonly, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :coordinateFormat, :disabled, :expirationTime, :deviceLimit, :userLimit, :deviceReadonly, :token, :timezone, :attributes) </entry> <entry key='database.updateUser'> @@ -90,6 +91,7 @@ userLimit = :userLimit, deviceReadonly = :deviceReadonly, token = :token, + timezone = :timezone, attributes = :attributes WHERE id = :id </entry> |