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

Merge branch 'master' into data-source-settings-to-react

Browse Source
This commit is contained in:
Peter Holmberg
2018-10-22 14:49:41 +02:00
parent 8ef705f2b5 6c473d33f4
commit c92813f313
211 changed files with 3652 additions and 1767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/routes/routes.ts
View File

@@ -13,7 +13,7 @@ import FolderPermissions from 'app/features/folders/FolderPermissions';
import DataSourcesListPage from 'app/features/datasources/DataSourcesListPage';
import NewDataSourcePage from '../features/datasources/NewDataSourcePage';
import UsersListPage from 'app/features/users/UsersListPage';
import EditDataSourcePage from 'app/features/datasources/EditDataSourcePage';
import DataSourceDashboards from 'app/features/datasources/DataSourceDashboards';
/** @ngInject */
export function setupAngularRoutes($routeProvider, $locationProvider) {
@@ -74,14 +74,9 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
},
})
.when('/datasources/edit/:id/dashboards', {
templateUrl: 'public/app/features/plugins/partials/ds_dashboards.html',
controller: 'DataSourceDashboardsCtrl',
controllerAs: 'ctrl',
})
.when('/datasources/edit/:id/:page?', {
template: '<react-container />',
resolve: {
component: () => EditDataSourcePage,
component: () => DataSourceDashboards,
},
})
.when('/datasources/new', {