Merge pull request #50 from sismics/master

Push to production
This commit is contained in:
Benjamin Gamard 2015-11-30 00:29:31 +01:00
commit b3ef9b0476
2 changed files with 4 additions and 1 deletions

View File

@ -29,6 +29,7 @@ Features
- Multi-users ACL system - Multi-users ACL system
- Audit log - Audit log
- Comments - Comments
- Storage quota per user
- Document sharing by URL - Document sharing by URL
- RESTful Web API - RESTful Web API
- Fully featured Android client - Fully featured Android client

View File

@ -228,8 +228,10 @@ public class AppResource extends BaseResource {
// Save all users // Save all users
for (User user : userMap.values()) { for (User user : userMap.values()) {
if (user.getDeleteDate() == null) {
userDao.update(user); userDao.update(user);
} }
}
// Always return OK // Always return OK
JsonObjectBuilder response = Json.createObjectBuilder() JsonObjectBuilder response = Json.createObjectBuilder()