dashboards: should be possible to browse dashboard using only uid
That is, the slug part of url should be optional.
Closes #11231
(cherry picked from commit 5fbfd67b94)
This commit is contained in:
committed by
bergquist
parent
a747ec349e
commit
e1b554c61e
@@ -66,6 +66,7 @@ func (hs *HttpServer) registerRoutes() {
|
|||||||
r.Get("/plugins/:id/page/:page", reqSignedIn, Index)
|
r.Get("/plugins/:id/page/:page", reqSignedIn, Index)
|
||||||
|
|
||||||
r.Get("/d/:uid/:slug", reqSignedIn, Index)
|
r.Get("/d/:uid/:slug", reqSignedIn, Index)
|
||||||
|
r.Get("/d/:uid", reqSignedIn, Index)
|
||||||
r.Get("/dashboard/db/:slug", reqSignedIn, redirectFromLegacyDashboardUrl, Index)
|
r.Get("/dashboard/db/:slug", reqSignedIn, redirectFromLegacyDashboardUrl, Index)
|
||||||
r.Get("/dashboard/script/*", reqSignedIn, Index)
|
r.Get("/dashboard/script/*", reqSignedIn, Index)
|
||||||
r.Get("/dashboard-solo/snapshot/*", Index)
|
r.Get("/dashboard-solo/snapshot/*", Index)
|
||||||
|
|||||||
@@ -22,6 +22,12 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
|
|||||||
reloadOnSearch: false,
|
reloadOnSearch: false,
|
||||||
pageClass: 'page-dashboard',
|
pageClass: 'page-dashboard',
|
||||||
})
|
})
|
||||||
|
.when('/d/:uid', {
|
||||||
|
templateUrl: 'public/app/partials/dashboard.html',
|
||||||
|
controller: 'LoadDashboardCtrl',
|
||||||
|
reloadOnSearch: false,
|
||||||
|
pageClass: 'page-dashboard',
|
||||||
|
})
|
||||||
.when('/dashboard/:type/:slug', {
|
.when('/dashboard/:type/:slug', {
|
||||||
templateUrl: 'public/app/partials/dashboard.html',
|
templateUrl: 'public/app/partials/dashboard.html',
|
||||||
controller: 'LoadDashboardCtrl',
|
controller: 'LoadDashboardCtrl',
|
||||||
|
|||||||
Reference in New Issue
Block a user