refactoring load badges and cities

Caio Almeida
1 parent 173fd82c
Showing 1 changed file with 2 additions and 3 deletions Show diff stats
www/js/controllers.js
@@ -122,7 +122,6 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
         $scope.closeModal();
         var popup = $ionicPopup.alert({ title: 'Login', template: 'Login efetuado com sucesso!' });
         $scope.profile = resp.data.user.person;
-        $scope.setStateAndCityOfProfile();
         popup.then(function() {
           $scope.loginCallback(resp.data.user.private_token);
         });
@@ -152,6 +151,8 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       $scope.parseURLParams();
       $scope.loadFollowedProposals();
       $scope.loadVotedProposals();
+      $scope.setStateAndCityOfProfile();
+      $scope.loadMyBadges();
     };
     // Function to retrieve password
@@ -1372,8 +1373,6 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       .then(function(resp) {
         $scope.profile = resp.data.person;
         $scope.loginCallback(ConfJuvAppUtils.getPrivateToken());
-        $scope.loadMyBadges();
-        $scope.setStateAndCityOfProfile();
         $scope.checkCompleteness($scope.profile);
         $scope.loading = false;
       }, function(err) {