Merge pull request #843 from Gym/bug-previous-state

[Bug] Previous State (History)
meanjs · Aug 23, 2015 · cfe71bb · cfe71bb
2 parents 51196c5 + c6d2683
commit cfe71bb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/modules/core/client/app/init.js b/modules/core/client/app/init.js
@@ -35,11 +35,13 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(function ($ro
 
   // Record previous state
   $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) {
-    $state.previous = {
-      state: fromState,
-      params: fromParams,
-      href: $state.href(fromState, fromParams)
-    };
+    if (!fromState.data || !fromState.data.ignoreState) {
+      $state.previous = {
+        state: fromState,
+        params: fromParams,
+        href: $state.href(fromState, fromParams)
+      };
+    }
   });
 });
 

diff --git a/modules/core/client/config/core.client.routes.js b/modules/core/client/config/core.client.routes.js
@@ -15,7 +15,10 @@ angular.module('core').config(['$stateProvider', '$urlRouterProvider',
       })
       .state('not-found', {
         url: '/not-found',
-        templateUrl: 'modules/core/client/views/404.client.view.html'
+        templateUrl: 'modules/core/client/views/404.client.view.html',
+        data: {
+          ignoreState: true
+        }
       });
   }
 ]);
diff --git a/modules/users/client/controllers/authentication.client.controller.js b/modules/users/client/controllers/authentication.client.controller.js
@@ -38,14 +38,12 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$stat
 
     // OAuth provider request
     $scope.callOauthProvider = function (url) {
-      var redirect_to;
-
-      if ($state.previous) {
-        redirect_to = $state.previous.href;
+      if ($state.previous && $state.previous.href) {
+        url += '?redirect_to=' + encodeURIComponent($state.previous.href);
       }
 
       // Effectively call OAuth authentication route:
-      $window.location.href = url + (redirect_to ? '?redirect_to=' + encodeURIComponent(redirect_to) : '');
+      $window.location.href = url;
     };
   }
 ]);