IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

dashfolders: new dashboard with folder selected

Browse Source 
Fixes #10133
This commit is contained in:
Daniel Lee 2017-12-11 16:37:40 +01:00
parent 795d9c0362
commit a37f1b77f1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/components/manage_dashboards/manage_dashboards.html
View File

@ -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()" /> <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>
<div class="page-action-bar__spacer"></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> <i class="fa fa-plus"></i>
Dashboard Dashboard
</a> </a>
@ -88,11 +88,11 @@
<empty-list-cta model="{ <empty-list-cta model="{
title: 'This folder doesn\'t have any dashboards yet', title: 'This folder doesn\'t have any dashboards yet',
buttonIcon: 'gicon gicon-dashboard-new', buttonIcon: 'gicon gicon-dashboard-new',
buttonLink: '/dashboard/new', buttonLink: '/dashboard/new?folderId={{ctrl.folderId}}',
buttonTitle: 'Create Dashboard', buttonTitle: 'Create Dashboard',
proTip: 'You can bulk move dashboards into this folder from the main dashboard list.', 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', proTipLink: 'http://docs.grafana.org/administration/provisioning/#datasources?utm_source=grafana_ds_list',
proTipLinkTitle: 'Learn more', proTipLinkTitle: 'Learn more',
proTipTarget: '_blank' proTipTarget: '_blank'
}" /> }" />
</div> </div>

5
public/app/core/routes/dashboard_loaders.ts
View File

@ -31,7 +31,7 @@ export class LoadDashboardCtrl {
export class NewDashboardCtrl { export class NewDashboardCtrl {
/** @ngInject */ /** @ngInject */
constructor($scope) { constructor($scope, $routeParams) {
$scope.initDashboard({ $scope.initDashboard({
meta: { canStar: false, canShare: false, isNew: true }, meta: { canStar: false, canShare: false, isNew: true },
dashboard: { dashboard: {
@ -42,7 +42,8 @@ export class NewDashboardCtrl {
gridPos: {x: 0, y: 0, w: 12, h: 9}, gridPos: {x: 0, y: 0, w: 12, h: 9},
title: 'Panel Title', title: 'Panel Title',
} }
] ],
folderId: Number($routeParams.folderId)
}, },
}, $scope); }, $scope);
} }