From b26e0ec669e8f8b6f011d83c257607c078b450d4 Mon Sep 17 00:00:00 2001
From: Fabian Becker <halfdan@xnorfz.de>
Date: Thu, 31 Jul 2014 14:18:44 +0200
Subject: [PATCH] Avoids duplicate notification / transition

no ref
- Let application.js handle transition after setup
- Remove duplicate loading of server notifications
---
 core/client/controllers/setup.js  | 3 ---
 core/client/controllers/signup.js | 3 ---
 core/client/routes/application.js | 6 ------
 3 files changed, 12 deletions(-)

diff --git a/core/client/controllers/setup.js b/core/client/controllers/setup.js
index bffbfbdb9c..914e096733 100644
--- a/core/client/controllers/setup.js
+++ b/core/client/controllers/setup.js
@@ -35,9 +35,6 @@ var SetupController = Ember.ObjectController.extend(ValidationEngine, {
                     self.get('session').authenticate('simple-auth-authenticator:oauth2-password-grant', {
                         identification: self.get('email'),
                         password: self.get('password')
-                    }).then(function () {
-                        self.send('signedIn');
-                        self.transitionToRoute(SimpleAuth.Configuration.routeAfterAuthentication);
                     });
                 }, function (resp) {
                     self.toggleProperty('submitting');
diff --git a/core/client/controllers/signup.js b/core/client/controllers/signup.js
index 3c2af6e310..4baa5de43d 100644
--- a/core/client/controllers/signup.js
+++ b/core/client/controllers/signup.js
@@ -36,9 +36,6 @@ var SignupController = Ember.ObjectController.extend(ValidationEngine, {
                     self.get('session').authenticate('simple-auth-authenticator:oauth2-password-grant', {
                         identification: self.get('email'),
                         password: self.get('password')
-                    }).then(function () {
-                        self.send('signedIn');
-                        self.transitionToRoute(SimpleAuth.Configuration.routeAfterAuthentication);
                     });
                 }, function (resp) {
                     self.toggleProperty('submitting');
diff --git a/core/client/routes/application.js b/core/client/routes/application.js
index 82cf0828db..628e9cff84 100644
--- a/core/client/routes/application.js
+++ b/core/client/routes/application.js
@@ -6,12 +6,6 @@ var ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, Shor
         'esc': 'closePopups'
     },
 
-    setupController: function () {
-        Ember.run.next(this, function () {
-            this.send('loadServerNotifications');
-        });
-    },
-
     actions: {
         closePopups: function () {
             this.get('popover').closePopovers();