From 11ae7d5964f7a612040b727e5896dada01cb3a82 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Sun, 31 Dec 2017 12:24:21 +0100
Subject: [PATCH] dashfolders: relative links should work when root_path is
 specified (#10363)

Fixes #10336
---
 .../components/manage_dashboards/manage_dashboards.html   | 8 ++++----
 .../components/manage_dashboards/manage_dashboards.ts     | 2 +-
 public/app/features/dashboard/create_folder_ctrl.ts       | 2 +-
 public/app/features/dashboard/folder_page_loader.ts       | 2 +-
 public/app/features/dashboard/folder_settings_ctrl.ts     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html
index cb2cec28bab..e9d7d743063 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.html
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.html
@@ -9,7 +9,7 @@
       <i class="fa fa-plus"></i>
       Dashboard
     </a>
-    <a class="btn btn-success" href="/dashboards/folder/new" ng-if="!ctrl.folderId">
+    <a class="btn btn-success" href="dashboards/folder/new" ng-if="!ctrl.folderId">
       <i class="fa fa-plus"></i>
       Folder
     </a>
@@ -108,11 +108,11 @@
   <empty-list-cta model="{
     title: 'This folder doesn\'t have any dashboards yet',
     buttonIcon: 'gicon gicon-dashboard-new',
-    buttonLink: '/dashboard/new?folderId={{ctrl.folderId}}',
+    buttonLink: 'dashboard/new?folderId={{ctrl.folderId}}',
     buttonTitle: 'Create Dashboard',
     proTip: 'Add dashboards into your folder at ->',
-    proTipLink: '/dashboards',
+    proTipLink: 'dashboards',
     proTipLinkTitle: 'Manage dashboards',
-    proTipTarget: '_blank'
+    proTipTarget: ''
   }" />
 </div>
diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.ts b/public/app/core/components/manage_dashboards/manage_dashboards.ts
index 962b17632dc..011e020f588 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.ts
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.ts
@@ -276,7 +276,7 @@ export class ManageDashboardsCtrl {
   }
 
   createDashboardUrl() {
-    let url = '/dashboard/new';
+    let url = 'dashboard/new';
 
     if (this.folderId) {
       url += `?folderId=${this.folderId}`;
diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts
index 9e9a466c206..414054232c2 100644
--- a/public/app/features/dashboard/create_folder_ctrl.ts
+++ b/public/app/features/dashboard/create_folder_ctrl.ts
@@ -20,7 +20,7 @@ export class CreateFolderCtrl {
     return this.backendSrv.createDashboardFolder(this.title).then(result => {
       appEvents.emit('alert-success', ['Folder Created', 'OK']);
 
-      var folderUrl = `/dashboards/folder/${result.dashboard.id}/${result.meta.slug}`;
+      var folderUrl = `dashboards/folder/${result.dashboard.id}/${result.meta.slug}`;
       this.$location.url(folderUrl);
     });
   }
diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/dashboard/folder_page_loader.ts
index f936d7eac0a..a2632df3d88 100644
--- a/public/app/features/dashboard/folder_page_loader.ts
+++ b/public/app/features/dashboard/folder_page_loader.ts
@@ -65,6 +65,6 @@ export class FolderPageLoader {
   }
 
   createFolderUrl(folderId: number, type: string, slug: string) {
-    return `/dashboards/folder/${folderId}/${slug}`;
+    return `dashboards/folder/${folderId}/${slug}`;
   }
 }
diff --git a/public/app/features/dashboard/folder_settings_ctrl.ts b/public/app/features/dashboard/folder_settings_ctrl.ts
index d4d39af3c2d..88abc5f9874 100644
--- a/public/app/features/dashboard/folder_settings_ctrl.ts
+++ b/public/app/features/dashboard/folder_settings_ctrl.ts
@@ -67,7 +67,7 @@ export class FolderSettingsCtrl {
       onConfirm: () => {
         return this.backendSrv.deleteDashboard(this.meta.slug).then(() => {
           appEvents.emit('alert-success', ['Folder Deleted', `${this.dashboard.title} has been deleted`]);
-          this.$location.url('/dashboards');
+          this.$location.url('dashboards');
         });
       },
     });