From 0052147b3b7aa589f154a175d98270202043f32e Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Thu, 21 Aug 2014 11:50:45 +0200
Subject: [PATCH] remember login form

---
 app/coffee/modules/auth.coffee             | 11 +++++------
 app/partials/views/modules/login-form.jade |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 7709912c..2f7d1ae9 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -159,9 +159,12 @@ LoginDirective = ($auth, $confirm, $location, $config, $routeParams) ->
 
         onSuccessSubmit = (response) ->
             if $routeParams and $routeParams['next'] and $routeParams['next'] != '/login'
-                $location.url($routeParams['next'])
+                $el.find("form").attr('action', $routeParams['next'])
             else
-                $location.path("/")
+                $el.find("form").attr('action', "/")
+
+            $el.find("form")
+            .submit()
 
         onErrorSubmit = (response) ->
             $confirm.notify("light-error", "According to our Oompa Loompas, your username/email or password
@@ -174,10 +177,6 @@ LoginDirective = ($auth, $confirm, $location, $config, $routeParams) ->
             promise = $auth.login($scope.data)
             promise.then(onSuccessSubmit, onErrorSubmit)
 
-        $el.on "submit", (event) ->
-            event.preventDefault()
-            submit()
-
         $el.on "click", "a.button-login", (event) ->
             event.preventDefault()
             submit()
diff --git a/app/partials/views/modules/login-form.jade b/app/partials/views/modules/login-form.jade
index f0f6d02b..a3473ff7 100644
--- a/app/partials/views/modules/login-form.jade
+++ b/app/partials/views/modules/login-form.jade
@@ -1,5 +1,5 @@
 div.login-form-container(tg-login)
-    form.login-form(ng-submit="ctrl.submit()")
+    form.login-form
         fieldset
             input(type="text", name="username", ng-model="data.username", data-required="true",
                   placeholder="Username or Email")