From c8e33aa6c74900039b377a143dadc3522eb86ca3 Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 10 Aug 2014 16:37:20 +0200 Subject: [PATCH] reload app after login --- src/main/app/js/controllers.js | 5 ++--- src/main/java/com/commafeed/CommaFeedApplication.java | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/app/js/controllers.js b/src/main/app/js/controllers.js index a032db93..1f74d759 100644 --- a/src/main/app/js/controllers.js +++ b/src/main/app/js/controllers.js @@ -1465,7 +1465,7 @@ module.controller('LoginCtrl', ['$scope', '$location', 'SessionService', functio var login = function(model) { var success = function(data) { - $location.path('/'); + window.location.href = window.location.href.substring(0, window.location.href.lastIndexOf('#')); }; var error = function(data) { $scope.message = data.data; @@ -1494,8 +1494,7 @@ module.controller('RegisterCtrl', ['$scope', '$location', 'SessionService', 'Ser $scope.register = function() { var success = function(data) { - $location.path('/'); - $scope.$emit('emitReload'); + window.location.href = window.location.href.substring(0, window.location.href.lastIndexOf('#')); }; var error = function(data) { $scope.messages = data.data.errors; diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java index c202058b..dbd569bc 100644 --- a/src/main/java/com/commafeed/CommaFeedApplication.java +++ b/src/main/java/com/commafeed/CommaFeedApplication.java @@ -210,6 +210,7 @@ public class CommaFeedApplication extends Application { environment.lifecycle().manage(schedulingService); // TODO swagger ui + // TODO password recovery } public static void main(String[] args) throws Exception {