Commit 9e62a777 by Alexander Zobnin

refactor: user groups to teams, rename frontend files

parent d8612380
......@@ -47,7 +47,7 @@ import {helpModal} from './components/help/help';
import {JsonExplorer} from './components/json_explorer/json_explorer';
import {NavModelSrv, NavModel} from './nav_model_srv';
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 {gfPageDirective} from './components/gf_page';
import {orgSwitcher} from './components/org_switcher';
......
......@@ -110,13 +110,13 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
resolve: loadOrgBundle,
})
.when('/org/teams', {
templateUrl: 'public/app/features/org/partials/user_groups.html',
templateUrl: 'public/app/features/org/partials/teams.html',
controller : 'TeamsCtrl',
controllerAs: 'ctrl',
resolve: loadOrgBundle,
})
.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',
controllerAs: 'ctrl',
resolve: loadOrgBundle,
......
......@@ -5,9 +5,9 @@ import './select_org_ctrl';
import './change_password_ctrl';
import './new_org_ctrl';
import './user_invite_ctrl';
import './user_groups_ctrl';
import './user_group_details_ctrl';
import './create_user_group_modal';
import './teams_ctrl';
import './team_details_ctrl';
import './create_team_modal';
import './org_api_keys_ctrl';
import './org_details_ctrl';
import './prefs_control';
......@@ -27,7 +27,7 @@ export class CreateTeamCtrl {
export function createTeamModal() {
return {
restrict: 'E',
templateUrl: 'public/app/features/org/partials/create_user_group.html',
templateUrl: 'public/app/features/org/partials/create_team.html',
controller: CreateTeamCtrl,
bindToController: true,
controllerAs: 'ctrl',
......
import '../user_group_details_ctrl';
import '../team_details_ctrl';
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', () => {
var ctx: any = {};
......
......@@ -52,7 +52,7 @@
}
.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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment