Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
scottashton 2014-04-17 14:12:24 +02:00
parent e4d5dfd7f2 ca984e1212
commit 931f10a402
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/actions/api-user.js
View File

@ -107,6 +107,10 @@ function post_api_user (req, res) {
}
var doc = users.save(user, json.passwd, json.active, json.extra, json.changePassword);
if (json.passwordToken) {
users.setPasswordToken(user, json.passwordToken);
}
users.reload();
actions.resultOk(req, res, actions.HTTP_CREATED, doc);

2
js/server/modules/org/arangodb/users.js
View File

@ -457,7 +457,7 @@ exports.changePassword = function (token, password) {
var hash = encodePassword(password);
users.update(current, { passwordToken: null, password: hash });
users.update(current, { passwordToken: null, password: hash, changePassword: false });
exports.reload();
return true;