Merge branch 'feature/design' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +admin / users / user-list / user-list.component.ts

diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts
index c3fa55825bca613e789943c3f5e53c8fd4917d32..1e8e1af49ea88545d56b041ec25638242c7c09f8 100644 (file)
--- a/client/src/app/+admin/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/users/user-list/user-list.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit } from '@angular/core'
-import { SortMeta } from 'primeng/primeng'
+import { Component } from '@angular/core'
+import { SortMeta } from 'primeng/components/common/sortmeta'
 
 import { NotificationsService } from 'angular2-notifications'
 
@@ -12,7 +12,7 @@ import { UserService } from '../shared'
   templateUrl: './user-list.component.html',
   styleUrls: [ './user-list.component.scss' ]
 })
-export class UserListComponent extends RestTable implements OnInit {
+export class UserListComponent extends RestTable {
   users: User[] = []
   totalRecords = 0
   rowsPerPage = 10
@@ -27,10 +27,6 @@ export class UserListComponent extends RestTable implements OnInit {
     super()
   }
 
-  ngOnInit () {
-    this.loadData()
-  }
-
   removeUser (user: User) {
     if (user.username === 'root') {
       this.notificationsService.error('Error', 'You cannot delete root.')
@@ -47,7 +43,7 @@ export class UserListComponent extends RestTable implements OnInit {
             this.loadData()
           },
 
-          err => this.notificationsService.error('Error', err)
+          err => this.notificationsService.error('Error', err.message)
         )
       }
     )
@@ -65,7 +61,7 @@ export class UserListComponent extends RestTable implements OnInit {
                         this.totalRecords = resultList.total
                       },
 
-                      err => this.notificationsService.error('Error', err)
+                      err => this.notificationsService.error('Error', err.message)
                     )
   }
 }