Skip to content

Commit

Permalink
* [FIX] Solves #428. Forced password change didn't redirect to the pa…
Browse files Browse the repository at this point in the history
…ssword change page. Thanks to @k-s-dean for the feedback.
  • Loading branch information
nuxsmin committed Feb 16, 2017
1 parent d151a9d commit 96ba94b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
1 change: 1 addition & 0 deletions inc/SP/Controller/LoginController.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ protected function checkPasswordChange()

$data = ['url' => Init::$WEBURI . '/index.php?a=passreset&h=' . $hash . '&t=' . time() . '&f=1'];
$this->jsonResponse->setData($data);
$this->jsonResponse->setStatus(0);
Json::returnJson($this->jsonResponse);
}

Expand Down
6 changes: 6 additions & 0 deletions js/app-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,12 @@ sysPass.Actions = function (Common) {

Common.appRequests().getActionCall(opts, function (json) {
Common.msg.out(json);

if (json.status == 0) {
setTimeout(function () {
Common.redirect("index.php");
}, 1000);
}
});
}
};
Expand Down
20 changes: 10 additions & 10 deletions js/app-actions.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 96ba94b

Please sign in to comment.