diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-03-13 17:52:28 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-03-13 17:52:28 +0500 |
| commit | 2309d53f52f25efe00f2195a58c448506a2605ab (patch) | |
| tree | 9fdddd2384e4e331c1642f919d3db4fb1621cccb /setup | |
| parent | 633bed5cd14c16d53c7b84ed2c6586915467e1a8 (diff) | |
| download | trackermap-server-2309d53f52f25efe00f2195a58c448506a2605ab.tar.gz trackermap-server-2309d53f52f25efe00f2195a58c448506a2605ab.tar.bz2 trackermap-server-2309d53f52f25efe00f2195a58c448506a2605ab.zip | |
- Add timezone field to User and Server model
- Pass Velocity DateTool to templates
- Adjusted templates to use timezone
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> |