diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
commit | 485bb64ddbcc372c5ed3d74190eda06f02cb3f82 (patch) | |
tree | e89ec33366b907bea794e9140f962d2951b29ff9 /webclient/login/login-controller.js | |
parent | Use new StreamToken in pagination config (diff) | |
parent | Add the ability to turn on the twisted manhole telnet service. (diff) | |
download | synapse-485bb64ddbcc372c5ed3d74190eda06f02cb3f82.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to '')
-rw-r--r-- | webclient/login/login-controller.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js index 67d0b7b90c..51f9a3bdf4 100644 --- a/webclient/login/login-controller.js +++ b/webclient/login/login-controller.js @@ -53,7 +53,7 @@ angular.module('LoginController', ['matrixService']) matrixService.saveConfig(); eventStreamService.resume(); // Go to the user's rooms list page - $location.path("rooms"); + $location.url("home"); }, function(error) { if (error.data) { @@ -70,6 +70,7 @@ angular.module('LoginController', ['matrixService']) $scope.login = function() { matrixService.setConfig({ homeserver: $scope.account.homeserver, + identityServer: $scope.account.identityServer, user_id: $scope.account.user_id }); // try to login @@ -79,12 +80,13 @@ angular.module('LoginController', ['matrixService']) $scope.feedback = "Login successful."; matrixService.setConfig({ homeserver: $scope.account.homeserver, + identityServer: $scope.account.identityServer, user_id: response.data.user_id, access_token: response.data.access_token }); matrixService.saveConfig(); eventStreamService.resume(); - $location.path("rooms"); + $location.url("home"); } else { $scope.feedback = "Failed to login: " + JSON.stringify(response.data); |