aboutsummaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-01-25 12:39:13 +0500
committerAbyss777 <abyss@fox5.ru>2017-01-25 12:39:13 +0500
commit483ed4418f53c5207d7150bf288ec6245d8f2cc3 (patch)
treedcfa32f533fe1a6e1d508ccbfddfa77139831f7b /setup
parent92f9691c9817526bd025377cb44aa336e7625592 (diff)
downloadtrackermap-server-483ed4418f53c5207d7150bf288ec6245d8f2cc3.tar.gz
trackermap-server-483ed4418f53c5207d7150bf288ec6245d8f2cc3.tar.bz2
trackermap-server-483ed4418f53c5207d7150bf288ec6245d8f2cc3.zip
- Add "deviceReadonly" user field
- Allow users edit tokens - Managers can create users with deviceLimit = 0 only - Manager can't create users with expirationTime later then their - Other permissions improvements
Diffstat (limited to 'setup')
-rw-r--r--setup/default.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 0ab3163f0..1b3722626 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -64,8 +64,8 @@
</entry>
<entry key='database.insertUser'>
- INSERT INTO users (name, email, hashedPassword, salt, readonly, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, coordinateFormat, disabled, expirationTime, deviceLimit, userLimit, token, attributes)
- VALUES (:name, :email, :hashedPassword, :salt, :readonly, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :coordinateFormat, :disabled, :expirationTime, :deviceLimit, :userLimit, :token, :attributes)
+ INSERT INTO users (name, email, hashedPassword, salt, readonly, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, coordinateFormat, disabled, expirationTime, deviceLimit, userLimit, deviceReadonly, token, attributes)
+ VALUES (:name, :email, :hashedPassword, :salt, :readonly, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :coordinateFormat, :disabled, :expirationTime, :deviceLimit, :userLimit, :deviceReadonly, :token, :attributes)
</entry>
<entry key='database.updateUser'>
@@ -86,6 +86,7 @@
expirationTime = :expirationTime,
deviceLimit = :deviceLimit,
userLimit = :userLimit,
+ deviceReadonly = :deviceReadonly,
token = :token,
attributes = :attributes
WHERE id = :id