aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/admin.module.ts4
-rw-r--r--client/src/app/+admin/users/user-edit/index.ts2
-rw-r--r--client/src/app/+admin/users/user-edit/user-create.component.ts (renamed from client/src/app/+admin/users/user-edit/user-add.component.ts)6
-rw-r--r--client/src/app/+admin/users/user-edit/user-edit.component.html2
-rw-r--r--client/src/app/+admin/users/user-list/user-list.component.html4
-rw-r--r--client/src/app/+admin/users/users.routes.ts8
6 files changed, 13 insertions, 13 deletions
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index b389f3d4f..8d50b8715 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -11,7 +11,7 @@ import { FollowingListComponent } from './follows/following-list/following-list.
11import { JobsComponent } from './jobs/job.component' 11import { JobsComponent } from './jobs/job.component'
12import { JobsListComponent } from './jobs/jobs-list/jobs-list.component' 12import { JobsListComponent } from './jobs/jobs-list/jobs-list.component'
13import { JobService } from './jobs/shared/job.service' 13import { JobService } from './jobs/shared/job.service'
14import { UserAddComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users' 14import { UserCreateComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users'
15import { VideoAbuseListComponent, VideoAbusesComponent } from './video-abuses' 15import { VideoAbuseListComponent, VideoAbusesComponent } from './video-abuses'
16import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-blacklist' 16import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-blacklist'
17 17
@@ -32,7 +32,7 @@ import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-bl
32 FollowingListComponent, 32 FollowingListComponent,
33 33
34 UsersComponent, 34 UsersComponent,
35 UserAddComponent, 35 UserCreateComponent,
36 UserUpdateComponent, 36 UserUpdateComponent,
37 UserListComponent, 37 UserListComponent,
38 38
diff --git a/client/src/app/+admin/users/user-edit/index.ts b/client/src/app/+admin/users/user-edit/index.ts
index edec02fbb..fd80a02e0 100644
--- a/client/src/app/+admin/users/user-edit/index.ts
+++ b/client/src/app/+admin/users/user-edit/index.ts
@@ -1,2 +1,2 @@
1export * from './user-add.component' 1export * from './user-create.component'
2export * from './user-update.component' 2export * from './user-update.component'
diff --git a/client/src/app/+admin/users/user-edit/user-add.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts
index 64cee43be..2a9882cde 100644
--- a/client/src/app/+admin/users/user-edit/user-add.component.ts
+++ b/client/src/app/+admin/users/user-edit/user-create.component.ts
@@ -17,11 +17,11 @@ import { UserCreate, UserRole } from '../../../../../../shared'
17import { UserEdit } from './user-edit' 17import { UserEdit } from './user-edit'
18 18
19@Component({ 19@Component({
20 selector: 'my-user-add', 20 selector: 'my-user-create',
21 templateUrl: './user-edit.component.html', 21 templateUrl: './user-edit.component.html',
22 styleUrls: [ './user-edit.component.scss' ] 22 styleUrls: [ './user-edit.component.scss' ]
23}) 23})
24export class UserAddComponent extends UserEdit implements OnInit { 24export class UserCreateComponent extends UserEdit implements OnInit {
25 error: string 25 error: string
26 26
27 form: FormGroup 27 form: FormGroup
@@ -89,6 +89,6 @@ export class UserAddComponent extends UserEdit implements OnInit {
89 } 89 }
90 90
91 getFormButtonTitle () { 91 getFormButtonTitle () {
92 return 'Add user' 92 return 'Create user'
93 } 93 }
94} 94}
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html
index 6dee0b7aa..a8c0ddadb 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.html
@@ -1,4 +1,4 @@
1<div class="form-sub-title" *ngIf="isCreation() === true">Add user</div> 1<div class="form-sub-title" *ngIf="isCreation() === true">Create user</div>
2<div class="form-sub-title" *ngIf="isCreation() === false">Edit user {{ username }}</div> 2<div class="form-sub-title" *ngIf="isCreation() === false">Edit user {{ username }}</div>
3 3
4<div *ngIf="error" class="alert alert-danger">{{ error }}</div> 4<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index 83db034e3..09a4ac1e7 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -1,9 +1,9 @@
1<div class="admin-sub-header"> 1<div class="admin-sub-header">
2 <div class="form-sub-title">Users list</div> 2 <div class="form-sub-title">Users list</div>
3 3
4 <a class="add-button" routerLink="/admin/users/add"> 4 <a class="add-button" routerLink="/admin/users/create">
5 <span class="icon icon-add"></span> 5 <span class="icon icon-add"></span>
6 Add user 6 Create user
7 </a> 7 </a>
8</div> 8</div>
9 9
diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts
index 3718dfd5c..7585eb852 100644
--- a/client/src/app/+admin/users/users.routes.ts
+++ b/client/src/app/+admin/users/users.routes.ts
@@ -3,7 +3,7 @@ import { Routes } from '@angular/router'
3import { UserRightGuard } from '../../core' 3import { UserRightGuard } from '../../core'
4import { UserRight } from '../../../../../shared' 4import { UserRight } from '../../../../../shared'
5import { UsersComponent } from './users.component' 5import { UsersComponent } from './users.component'
6import { UserAddComponent, UserUpdateComponent } from './user-edit' 6import { UserCreateComponent, UserUpdateComponent } from './user-edit'
7import { UserListComponent } from './user-list' 7import { UserListComponent } from './user-list'
8 8
9export const UsersRoutes: Routes = [ 9export const UsersRoutes: Routes = [
@@ -30,11 +30,11 @@ export const UsersRoutes: Routes = [
30 } 30 }
31 }, 31 },
32 { 32 {
33 path: 'add', 33 path: 'create',
34 component: UserAddComponent, 34 component: UserCreateComponent,
35 data: { 35 data: {
36 meta: { 36 meta: {
37 title: 'Add a user' 37 title: 'Create a user'
38 } 38 }
39 } 39 }
40 }, 40 },