summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-10-27 11:58:23 +0000
committerKegan Dougal <kegan@matrix.org>2014-10-27 11:58:23 +0000
commit6603e39e6a643223b9659331c5d0724aad09d50b (patch)
treeff41aefd6e0c6913ae355198012f4265e61fa8d3
parentRemove test_pyflakes. (diff)
downloadsynapse-6603e39e6a643223b9659331c5d0724aad09d50b.tar.xz
Fix SYWEB-109 : No error if HS rejects the username in registration.
Display all error messages from the server when registering, rather
than just the types of errors the client recognises.
-rw-r--r--webclient/login/register-controller.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/webclient/login/register-controller.js b/webclient/login/register-controller.js
index b3c0c21335..be970ce1c3 100644
--- a/webclient/login/register-controller.js
+++ b/webclient/login/register-controller.js
@@ -140,6 +140,9 @@ angular.module('RegisterController', ['matrixService'])
                         $scope.feedback = "Captcha is required on this home " +
                                           "server.";
                     }
+                    else if (error.data.error) {
+                        $scope.feedback = error.data.error;
+                    }
                 }
                 else if (error.status === 0) {
                     $scope.feedback = "Unable to talk to the server.";