After automatic redirect to login page, when user successfuly logs in…

…, user is redirected to original page.
softwaremill · Jan 30, 2013 · d9abf10 · adamw · Jan 30, 2013 · pbuda
1 parent d5af57f
commit d9abf10
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/bootstrap-ui/src/main/webapp/app/application.js b/bootstrap-ui/src/main/webapp/app/application.js
@@ -1,6 +1,6 @@
 "use strict";
 
-angular.module('smlBootstrap', ['smlBootstrap.services', 'smlBootstrap.filters', 'smlBootstrap.controllers', 'smlBootstrap.directives', 'ngSanitize', 'ajaxthrobber'])
+angular.module('smlBootstrap', ['smlBootstrap.services', 'smlBootstrap.filters', 'smlBootstrap.controllers', 'smlBootstrap.directives', 'ngSanitize', 'ajaxthrobber', 'ngCookies'])
 
     .config(function ($routeProvider) {
 
@@ -70,7 +70,7 @@ angular.module('smlBootstrap', ['smlBootstrap.services', 'smlBootstrap.filters',
     .run(function ($rootScope, UserSessionService, $location) {
         $rootScope.$on("$routeChangeStart", function (event, next, current) {
             if (!UserSessionService.isLogged() && (typeof next.templateUrl !== "undefined") && next.templateUrl.indexOf("/secured/") > -1) {
-                $location.path("/login");
+                $location.search("page", $location.url()).path("/login");
             } else if (UserSessionService.isLogged() && next.templateUrl === "partials/login.html") {
                 $location.path("/");
             }

diff --git a/bootstrap-ui/src/main/webapp/app/controllers.js b/bootstrap-ui/src/main/webapp/app/controllers.js
@@ -181,7 +181,7 @@ controllers.controller('RegisterController', function RegisterController($scope,
 
 });
 
-controllers.controller('LoginController', function LoginController($scope, UserSessionService, $location) {
+controllers.controller('LoginController', function LoginController($scope, UserSessionService, $location, $routeParams) {
 
     var self = this;
 
@@ -202,7 +202,13 @@ controllers.controller('LoginController', function LoginController($scope, UserS
 
 
     this.loginOk = function () {
-        $location.path("");
+        var optionalRedir = $routeParams.page;
+        if (typeof optionalRedir !== "undefined") {
+            $location.search("page", null);
+            $location.path(optionalRedir);
+        } else {
+            $location.path("");
+        }
     };
 
     this.loginFailed = function () {