mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
refactor: user groups to teams, rename frontend files
This commit is contained in:
parent
d8612380e9
commit
9e62a777c7
@ -47,7 +47,7 @@ import {helpModal} from './components/help/help';
|
|||||||
import {JsonExplorer} from './components/json_explorer/json_explorer';
|
import {JsonExplorer} from './components/json_explorer/json_explorer';
|
||||||
import {NavModelSrv, NavModel} from './nav_model_srv';
|
import {NavModelSrv, NavModel} from './nav_model_srv';
|
||||||
import {userPicker} from './components/user_picker';
|
import {userPicker} from './components/user_picker';
|
||||||
import {teamPicker} from './components/user_group_picker';
|
import {teamPicker} from './components/team_picker';
|
||||||
import {geminiScrollbar} from './components/scroll/scroll';
|
import {geminiScrollbar} from './components/scroll/scroll';
|
||||||
import {gfPageDirective} from './components/gf_page';
|
import {gfPageDirective} from './components/gf_page';
|
||||||
import {orgSwitcher} from './components/org_switcher';
|
import {orgSwitcher} from './components/org_switcher';
|
||||||
|
@ -110,13 +110,13 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
|
|||||||
resolve: loadOrgBundle,
|
resolve: loadOrgBundle,
|
||||||
})
|
})
|
||||||
.when('/org/teams', {
|
.when('/org/teams', {
|
||||||
templateUrl: 'public/app/features/org/partials/user_groups.html',
|
templateUrl: 'public/app/features/org/partials/teams.html',
|
||||||
controller : 'TeamsCtrl',
|
controller : 'TeamsCtrl',
|
||||||
controllerAs: 'ctrl',
|
controllerAs: 'ctrl',
|
||||||
resolve: loadOrgBundle,
|
resolve: loadOrgBundle,
|
||||||
})
|
})
|
||||||
.when('/org/teams/edit/:id', {
|
.when('/org/teams/edit/:id', {
|
||||||
templateUrl: 'public/app/features/org/partials/user_group_details.html',
|
templateUrl: 'public/app/features/org/partials/team_details.html',
|
||||||
controller : 'TeamDetailsCtrl',
|
controller : 'TeamDetailsCtrl',
|
||||||
controllerAs: 'ctrl',
|
controllerAs: 'ctrl',
|
||||||
resolve: loadOrgBundle,
|
resolve: loadOrgBundle,
|
||||||
|
@ -5,9 +5,9 @@ import './select_org_ctrl';
|
|||||||
import './change_password_ctrl';
|
import './change_password_ctrl';
|
||||||
import './new_org_ctrl';
|
import './new_org_ctrl';
|
||||||
import './user_invite_ctrl';
|
import './user_invite_ctrl';
|
||||||
import './user_groups_ctrl';
|
import './teams_ctrl';
|
||||||
import './user_group_details_ctrl';
|
import './team_details_ctrl';
|
||||||
import './create_user_group_modal';
|
import './create_team_modal';
|
||||||
import './org_api_keys_ctrl';
|
import './org_api_keys_ctrl';
|
||||||
import './org_details_ctrl';
|
import './org_details_ctrl';
|
||||||
import './prefs_control';
|
import './prefs_control';
|
||||||
|
@ -27,7 +27,7 @@ export class CreateTeamCtrl {
|
|||||||
export function createTeamModal() {
|
export function createTeamModal() {
|
||||||
return {
|
return {
|
||||||
restrict: 'E',
|
restrict: 'E',
|
||||||
templateUrl: 'public/app/features/org/partials/create_user_group.html',
|
templateUrl: 'public/app/features/org/partials/create_team.html',
|
||||||
controller: CreateTeamCtrl,
|
controller: CreateTeamCtrl,
|
||||||
bindToController: true,
|
bindToController: true,
|
||||||
controllerAs: 'ctrl',
|
controllerAs: 'ctrl',
|
@ -1,6 +1,6 @@
|
|||||||
import '../user_group_details_ctrl';
|
import '../team_details_ctrl';
|
||||||
import {describe, beforeEach, it, expect, sinon, angularMocks} from 'test/lib/common';
|
import {describe, beforeEach, it, expect, sinon, angularMocks} from 'test/lib/common';
|
||||||
import TeamDetailsCtrl from '../user_group_details_ctrl';
|
import TeamDetailsCtrl from '../team_details_ctrl';
|
||||||
|
|
||||||
describe('TeamDetailsCtrl', () => {
|
describe('TeamDetailsCtrl', () => {
|
||||||
var ctx: any = {};
|
var ctx: any = {};
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
@ -52,7 +52,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.gicon-team {
|
.gicon-team {
|
||||||
background-image: url('../img/icons_#{$theme-name}_theme/icon_user_group.svg');
|
background-image: url('../img/icons_#{$theme-name}_theme/icon_team.svg');
|
||||||
}
|
}
|
||||||
|
|
||||||
.gicon-org {
|
.gicon-org {
|
||||||
|
Loading…
Reference in New Issue
Block a user