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 "Org users to react"

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

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

@@ -10,7 +10,6 @@ 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) {
@@ -134,10 +133,9 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
controller: 'NewOrgCtrl',
})
.when('/org/users', {
template: '<react-container />',
resolve: {
component: () => UsersListPage,
},
templateUrl: 'public/app/features/org/partials/orgUsers.html',
controller: 'OrgUsersCtrl',
controllerAs: 'ctrl',
})
.when('/org/users/invite', {
templateUrl: 'public/app/features/org/partials/invite.html',