From a37f1b77f16820942b4ad7b2f0b36b41a78e9491 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 11 Dec 2017 16:37:40 +0100
Subject: [PATCH] dashfolders: new dashboard with folder selected

Fixes #10133
---
 .../components/manage_dashboards/manage_dashboards.html     | 6 +++---
 public/app/core/routes/dashboard_loaders.ts                 | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html
index 957bca0262c..a19a63a550b 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.html
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.html
@@ -4,7 +4,7 @@
     <input type="text" class="gf-form-input max-width-30" placeholder="Find Dashboard by name" tabindex="1" give-focus="true" ng-model="ctrl.query.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.onQueryChange()" />
   </div>
   <div class="page-action-bar__spacer"></div>
-  <a class="btn btn-success" href="/dashboard/new">
+  <a class="btn btn-success" href="/dashboard/new?folderId={{ctrl.folderId}}">
     <i class="fa fa-plus"></i>
     Dashboard
   </a>
@@ -88,11 +88,11 @@
   <empty-list-cta model="{
     title: 'This folder doesn\'t have any dashboards yet',
     buttonIcon: 'gicon gicon-dashboard-new',
-    buttonLink: '/dashboard/new',
+    buttonLink: '/dashboard/new?folderId={{ctrl.folderId}}',
     buttonTitle: 'Create Dashboard',
     proTip: 'You can bulk move dashboards into this folder from the main dashboard list.',
     proTipLink: 'http://docs.grafana.org/administration/provisioning/#datasources?utm_source=grafana_ds_list',
     proTipLinkTitle: 'Learn more',
     proTipTarget: '_blank'
   }" />
-</div>
\ No newline at end of file
+</div>
diff --git a/public/app/core/routes/dashboard_loaders.ts b/public/app/core/routes/dashboard_loaders.ts
index bacd387456e..4e32a378a3b 100644
--- a/public/app/core/routes/dashboard_loaders.ts
+++ b/public/app/core/routes/dashboard_loaders.ts
@@ -31,7 +31,7 @@ export class LoadDashboardCtrl {
 export class NewDashboardCtrl {
 
   /** @ngInject */
-  constructor($scope) {
+  constructor($scope, $routeParams) {
     $scope.initDashboard({
       meta: { canStar: false, canShare: false, isNew: true },
       dashboard: {
@@ -42,7 +42,8 @@ export class NewDashboardCtrl {
             gridPos: {x: 0, y: 0, w: 12, h: 9},
             title: 'Panel Title',
           }
-        ]
+        ],
+        folderId: Number($routeParams.folderId)
       },
     }, $scope);
   }