Fixed flash messages for bad login

CLOSER-Cohorts · Jul 4, 2016 · 938a7f0 · 938a7f0
1 parent 91ad775
commit 938a7f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/assets/javascripts/templates/sign_up_in.html b/app/assets/javascripts/templates/sign_up_in.html
@@ -1,3 +1,7 @@
+<div class="row">
+    <notices class="col-md-10 col-md-offset-1"></notices>
+</div>
+
 <div data-ng-controller="UserController" class="col-md-4 col-md-offset-4">
 
     <!-- Nav tabs -->

diff --git a/app/assets/javascripts/users.coffee b/app/assets/javascripts/users.coffee
@@ -13,7 +13,7 @@ users.controller(
       $scope.sign_in = (cred)->
         $scope.user.set('email', cred.email)
         $scope.user.sign_in(cred.password).then(->
-            $location.path '/instruments'
+          $location.path '/instruments'
         ,->
           $scope.publish_flash()
           cred.password = ""
@@ -26,7 +26,7 @@ users.controller(
         $scope.user.set('group_id', details.group)
         $scope.user.sign_up(details.password, details.confirm).then(->
           $location.path '/instruments'
-	  true
+          true
         ,->
           $scope.publish_flash()
           details.password = ""
@@ -44,8 +44,9 @@ users.factory(
   'User',
   [
     '$http',
+    '$q',
     'Flash'
-    ($http, Flash)->
+    ($http, $q, Flash)->
       class
         constructor: (@email)->
           @logged_in = false
@@ -81,7 +82,7 @@ users.factory(
             ,(res)->
               self.logged_in = false
               Flash.add 'danger', res.data.error
-              false
+              $q.reject res.data.error
           )
 
         sign_out: ->