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

Revert "Revert "Org users to react""

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-10-03 09:43:10 +02:00
committed by GitHub
parent d59c86ccbb
commit afdec3d1b0
39 changed files with 1860 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import PluginListPage from 'app/features/plugins/PluginListPage';
import FolderSettingsPage from 'app/features/folders/FolderSettingsPage';
import FolderPermissions from 'app/features/folders/FolderPermissions';
import DataSourcesListPage from 'app/features/datasources/DataSourcesListPage';
import UsersListPage from 'app/features/users/UsersListPage';
/** @ngInject */
export function setupAngularRoutes($routeProvider, $locationProvider) {
@@ -133,9 +134,10 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
controller: 'NewOrgCtrl',
})
.when('/org/users', {
templateUrl: 'public/app/features/org/partials/orgUsers.html',
controller: 'OrgUsersCtrl',
controllerAs: 'ctrl',
template: '<react-container />',
resolve: {
component: () => UsersListPage,
},
})
.when('/org/users/invite', {
templateUrl: 'public/app/features/org/partials/invite.html',