From 4545b4d32385350a6ca485a1c8a52a1b8b198e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 7 Jul 2016 14:48:22 +0200
Subject: [PATCH] fix(login): minor fix redirect on login change

---
 public/app/core/components/sidemenu/sidemenu.html | 2 +-
 public/app/core/components/sidemenu/sidemenu.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
index 1ee2776bfe9..975e198b009 100644
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ b/public/app/core/components/sidemenu/sidemenu.html
@@ -45,7 +45,7 @@
 	</li>
 
 	<li ng-show="::!ctrl.isSignedIn">
-    <a href="{{ctrl.loginUrl}}" class="sidemenu-item">
+    <a href="{{ctrl.loginUrl}}" class="sidemenu-item" target="_self">
 			<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-in"></i></span>
 			<span class="sidemenu-item-text">Sign in</span>
 		</a>
diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
index a4b1f5d454a..84154621a0a 100644
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ b/public/app/core/components/sidemenu/sidemenu.ts
@@ -23,13 +23,13 @@ export class SideMenuCtrl {
 
     this.mainLinks = config.bootData.mainNavLinks;
     this.openUserDropdown();
-    this.loginUrl = '/login?redirect=' + encodeURIComponent(this.$location.path());
+    this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
 
     this.$scope.$on('$routeChangeSuccess', () => {
       if (!this.contextSrv.pinned) {
         this.contextSrv.sidemenu = false;
       }
-      this.loginUrl = '/login?redirect=' + encodeURIComponent(this.$location.path());
+      this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
     });
   }