From 96ef2db0202263e3a5992b6d2fee78ad3b6bb6ba Mon Sep 17 00:00:00 2001
From: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Date: Wed, 5 Aug 2015 16:22:49 -0300
Subject: [PATCH] Fix bug to login after user confirmation

---
 js/main.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/js/main.js b/js/main.js
index 8ffb622..eea3d7b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -325,7 +325,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
           }
         } else if (user) {
           // fluxo signup vindo das caixas de login dentro dos programas
-          if(requireLoginContainer.length > 0){
+          if(requireLoginContainer && requireLoginContainer.length > 0){
             var loginContainer = requireLoginContainer.find('.login-container');
             loginContainer.show();
             loginContainer.find('.new-user').click();
@@ -337,8 +337,11 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
             fillSignupForm($signupForm, user);
           }
         } else {
-          requireLoginContainer.find('.require-login').hide();
-          requireLoginContainer.find('.login-container').show();
+
+          if(requireLoginContainer){
+            requireLoginContainer.find('.require-login').hide();
+            requireLoginContainer.find('.login-container').show();
+          }
           Main.showLogin();
         }
       },
@@ -977,6 +980,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
         if(data.person){
           Main.setUser({person: data.person});
         }
+        data = data.user || data;
         Main.loginCallback(data.activated, data.private_token);
       },
       handleLoginFail: function (e){
--
libgit2 0.21.2