User add -> User create

diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index b389f3d4fec11598c337184053937ead25d7b294..8d50b8715612506ed61d7590982e244069711540 100644 (file)
--- 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.
 import { JobsComponent } from './jobs/job.component'
 import { JobsListComponent } from './jobs/jobs-list/jobs-list.component'
 import { JobService } from './jobs/shared/job.service'
-import { UserAddComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users'
+import { UserCreateComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users'
 import { VideoAbuseListComponent, VideoAbusesComponent } from './video-abuses'
 import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-blacklist'
 
@@ -32,7 +32,7 @@ import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-bl
     FollowingListComponent,
 
     UsersComponent,
-    UserAddComponent,
+    UserCreateComponent,
     UserUpdateComponent,
     UserListComponent,
 

diff --git a/client/src/app/+admin/users/user-edit/index.ts b/client/src/app/+admin/users/user-edit/index.ts
index edec02fbb6a7e548672f635cdae415d8f6e6a117..fd80a02e091ab4ad44d0da4c4ad6fd0fd4804900 100644 (file)
--- a/client/src/app/+admin/users/user-edit/index.ts
+++ b/client/src/app/+admin/users/user-edit/index.ts
@@ -1,2 +1,2 @@
-export * from './user-add.component'
+export * from './user-create.component'
 export * 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-add.component.ts
deleted file mode 100644 (file)
index 64cee43..0000000
--- a/client/src/app/+admin/users/user-edit/user-add.component.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-import { FormBuilder, FormGroup } from '@angular/forms'
-import { Router } from '@angular/router'
-
-import { NotificationsService } from 'angular2-notifications'
-
-import { UserService } from '../shared'
-import {
-  USER_USERNAME,
-  USER_EMAIL,
-  USER_PASSWORD,
-  USER_VIDEO_QUOTA,
-  USER_ROLE
-} from '../../../shared'
-import { ServerService } from '../../../core'
-import { UserCreate, UserRole } from '../../../../../../shared'
-import { UserEdit } from './user-edit'
-
-@Component({
-  selector: 'my-user-add',
-  templateUrl: './user-edit.component.html',
-  styleUrls: [ './user-edit.component.scss' ]
-})
-export class UserAddComponent extends UserEdit implements OnInit {
-  error: string
-
-  form: FormGroup
-  formErrors = {
-    'username': '',
-    'email': '',
-    'password': '',
-    'role': '',
-    'videoQuota': ''
-  }
-  validationMessages = {
-    'username': USER_USERNAME.MESSAGES,
-    'email': USER_EMAIL.MESSAGES,
-    'password': USER_PASSWORD.MESSAGES,
-    'role': USER_ROLE.MESSAGES,
-    'videoQuota': USER_VIDEO_QUOTA.MESSAGES
-  }
-
-  constructor (
-    protected serverService: ServerService,
-    private formBuilder: FormBuilder,
-    private router: Router,
-    private notificationsService: NotificationsService,
-    private userService: UserService
-  ) {
-    super()
-  }
-
-  buildForm () {
-    this.form = this.formBuilder.group({
-      username: [ '', USER_USERNAME.VALIDATORS ],
-      email:    [ '', USER_EMAIL.VALIDATORS ],
-      password: [ '', USER_PASSWORD.VALIDATORS ],
-      role: [ UserRole.USER, USER_ROLE.VALIDATORS ],
-      videoQuota: [ '-1', USER_VIDEO_QUOTA.VALIDATORS ]
-    })
-
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
-  }
-
-  ngOnInit () {
-    this.buildForm()
-  }
-
-  formValidated () {
-    this.error = undefined
-
-    const userCreate: UserCreate = this.form.value
-
-    // A select in HTML is always mapped as a string, we convert it to number
-    userCreate.videoQuota = parseInt(this.form.value['videoQuota'], 10)
-
-    this.userService.addUser(userCreate).subscribe(
-      () => {
-        this.notificationsService.success('Success', `User ${userCreate.username} created.`)
-        this.router.navigate([ '/admin/users/list' ])
-      },
-
-      err => this.error = err.message
-    )
-  }
-
-  isCreation () {
-    return true
-  }
-
-  getFormButtonTitle () {
-    return 'Add user'
-  }
-}

diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts
new file mode 100644 (file)
index 0000000..2a9882c
--- /dev/null
+++ b/client/src/app/+admin/users/user-edit/user-create.component.ts
@@ -0,0 +1,94 @@
+import { Component, OnInit } from '@angular/core'
+import { FormBuilder, FormGroup } from '@angular/forms'
+import { Router } from '@angular/router'
+
+import { NotificationsService } from 'angular2-notifications'
+
+import { UserService } from '../shared'
+import {
+  USER_USERNAME,
+  USER_EMAIL,
+  USER_PASSWORD,
+  USER_VIDEO_QUOTA,
+  USER_ROLE
+} from '../../../shared'
+import { ServerService } from '../../../core'
+import { UserCreate, UserRole } from '../../../../../../shared'
+import { UserEdit } from './user-edit'
+
+@Component({
+  selector: 'my-user-create',
+  templateUrl: './user-edit.component.html',
+  styleUrls: [ './user-edit.component.scss' ]
+})
+export class UserCreateComponent extends UserEdit implements OnInit {
+  error: string
+
+  form: FormGroup
+  formErrors = {
+    'username': '',
+    'email': '',
+    'password': '',
+    'role': '',
+    'videoQuota': ''
+  }
+  validationMessages = {
+    'username': USER_USERNAME.MESSAGES,
+    'email': USER_EMAIL.MESSAGES,
+    'password': USER_PASSWORD.MESSAGES,
+    'role': USER_ROLE.MESSAGES,
+    'videoQuota': USER_VIDEO_QUOTA.MESSAGES
+  }
+
+  constructor (
+    protected serverService: ServerService,
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private notificationsService: NotificationsService,
+    private userService: UserService
+  ) {
+    super()
+  }
+
+  buildForm () {
+    this.form = this.formBuilder.group({
+      username: [ '', USER_USERNAME.VALIDATORS ],
+      email:    [ '', USER_EMAIL.VALIDATORS ],
+      password: [ '', USER_PASSWORD.VALIDATORS ],
+      role: [ UserRole.USER, USER_ROLE.VALIDATORS ],
+      videoQuota: [ '-1', USER_VIDEO_QUOTA.VALIDATORS ]
+    })
+
+    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
+  }
+
+  ngOnInit () {
+    this.buildForm()
+  }
+
+  formValidated () {
+    this.error = undefined
+
+    const userCreate: UserCreate = this.form.value
+
+    // A select in HTML is always mapped as a string, we convert it to number
+    userCreate.videoQuota = parseInt(this.form.value['videoQuota'], 10)
+
+    this.userService.addUser(userCreate).subscribe(
+      () => {
+        this.notificationsService.success('Success', `User ${userCreate.username} created.`)
+        this.router.navigate([ '/admin/users/list' ])
+      },
+
+      err => this.error = err.message
+    )
+  }
+
+  isCreation () {
+    return true
+  }
+
+  getFormButtonTitle () {
+    return 'Create user'
+  }
+}

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 6dee0b7aa5cf605cf920a1508b27d21055ba42bb..a8c0ddadb6cce89063471b1d287f5b86062b622b 100644 (file)
--- 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 @@
-<div class="form-sub-title" *ngIf="isCreation() === true">Add user</div>
+<div class="form-sub-title" *ngIf="isCreation() === true">Create user</div>
 <div class="form-sub-title" *ngIf="isCreation() === false">Edit user {{ username }}</div>
 
 <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 83db034e3374613c35e848413e5336c579ad9d76..09a4ac1e72be3f81f0592f7250604f9ddf1bce28 100644 (file)
--- 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 @@
 <div class="admin-sub-header">
   <div class="form-sub-title">Users list</div>
 
-  <a class="add-button" routerLink="/admin/users/add">
+  <a class="add-button" routerLink="/admin/users/create">
     <span class="icon icon-add"></span>
-    Add user
+    Create user
   </a>
 </div>
 

diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts
index 3718dfd5cd178817ba259dda35121ead96d7e29a..7585eb852374a5f10ed00b81f78d397c0277b105 100644 (file)
--- 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'
 import { UserRightGuard } from '../../core'
 import { UserRight } from '../../../../../shared'
 import { UsersComponent } from './users.component'
-import { UserAddComponent, UserUpdateComponent } from './user-edit'
+import { UserCreateComponent, UserUpdateComponent } from './user-edit'
 import { UserListComponent } from './user-list'
 
 export const UsersRoutes: Routes = [
@@ -30,11 +30,11 @@ export const UsersRoutes: Routes = [
         }
       },
       {
-        path: 'add',
-        component: UserAddComponent,
+        path: 'create',
+        component: UserCreateComponent,
         data: {
           meta: {
-            title: 'Add a user'
+            title: 'Create a user'
           }
         }
       },