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 org-users-to-react

Browse Source
This commit is contained in:
Peter Holmberg
2018-10-02 11:18:01 +02:00
parent cc1e22925f f37a60dcd5
commit 09b681326e
164 changed files with 8271 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import ServerStats from 'app/features/admin/ServerStats';
import AlertRuleList from 'app/features/alerting/AlertRuleList';
import TeamPages from 'app/features/teams/TeamPages';
import TeamList from 'app/features/teams/TeamList';
import ApiKeys from 'app/features/api-keys/ApiKeysPage';
import PluginListPage from 'app/features/plugins/PluginListPage';
import FolderSettingsPage from 'app/features/folders/FolderSettingsPage';
import FolderPermissions from 'app/features/folders/FolderPermissions';
@@ -118,6 +119,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
})
.when('/explore', {
template: '<react-container />',
reloadOnSearch: false,
resolve: {
roles: () => ['Editor', 'Admin'],
component: () => import(/* webpackChunkName: "explore" */ 'app/features/explore/Wrapper'),
@@ -143,8 +145,11 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
controllerAs: 'ctrl',
})
.when('/org/apikeys', {
templateUrl: 'public/app/features/org/partials/orgApiKeys.html',
controller: 'OrgApiKeysCtrl',
template: '<react-container />',
resolve: {
roles: () => ['Editor', 'Admin'],
component: () => ApiKeys,
},
})
.when('/org/teams', {
template: '<react-container />',