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 'data-source-instance-to-react' into data-source-settings-to-react

Browse Source
This commit is contained in:
Peter Holmberg
2018-10-12 09:20:43 +02:00
parent b5e1a8d7be c9721bf8cc
commit c5946ebd27
33 changed files with 3683 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +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';
/** @ngInject */
export function setupAngularRoutes($routeProvider, $locationProvider) {
@@ -82,6 +83,12 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
controller: 'DataSourceDashboardsCtrl',
controllerAs: 'ctrl',
})
.when('/datasources/edit/:id/:page?', {
template: '<react-container />',
resolve: {
component: () => EditDataSourcePage,
},
})
.when('/datasources/new', {
template: '<react-container />',
resolve: {