3 files changed, 37 insertions, 4 deletions

diff --git a/client/src/app/shared/forms/form-validators/user.ts b/client/src/app/shared/forms/form-validators/user.ts
index fd316583e..087a99760 100644
--- a/client/src/app/shared/forms/form-validators/user.ts
+++ b/client/src/app/shared/forms/form-validators/user.ts
@@ -22,3 +22,10 @@ export const USER_PASSWORD = {
     'minlength': 'Password must be at least 6 characters long.'
   }
 }
+export const USER_VIDEO_QUOTA = {
+  VALIDATORS: [ Validators.required, Validators.min(-1) ],
+  MESSAGES: {
+    'required': 'Video quota is required.',
+    'min': 'Quota must be greater than -1.'
+  }
+}
\ No newline at end of file
diff --git a/client/src/app/shared/rest/rest-data-source.ts b/client/src/app/shared/rest/rest-data-source.ts
index 7956637e0..5c205d280 100644
--- a/client/src/app/shared/rest/rest-data-source.ts
+++ b/client/src/app/shared/rest/rest-data-source.ts
@@ -3,14 +3,31 @@ import { Http, RequestOptionsArgs, URLSearchParams, Response } from '@angular/ht
 import { ServerDataSource } from 'ng2-smart-table'
 
 export class RestDataSource extends ServerDataSource {
-  constructor (http: Http, endpoint: string) {
+  private updateResponse: (input: any[]) => any[]
+
+  constructor (http: Http, endpoint: string, updateResponse?: (input: any[]) => any[]) {
     const options = {
       endPoint: endpoint,
       sortFieldKey: 'sort',
       dataKey: 'data'
     }
-
     super(http, options)
+
+    if (updateResponse) {
+      this.updateResponse = updateResponse
+    }
+  }
+
+  protected extractDataFromResponse (res: Response) {
+    const json = res.json()
+    if (!json) return []
+    let data = json.data
+
+    if (this.updateResponse !== undefined) {
+      data = this.updateResponse(data)
+    }
+
+    return data
   }
 
   protected extractTotalFromResponse (res: Response) {
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts
index 1c2b481e3..bf12876c7 100644
--- a/client/src/app/shared/users/user.model.ts
+++ b/client/src/app/shared/users/user.model.ts
@@ -6,6 +6,7 @@ export class User implements UserServerModel {
   email: string
   role: UserRole
   displayNSFW: boolean
+  videoQuota: number
   createdAt: Date
 
   constructor (hash: {
@@ -13,6 +14,7 @@ export class User implements UserServerModel {
     username: string,
     email: string,
     role: UserRole,
+    videoQuota?: number,
     displayNSFW?: boolean,
     createdAt?: Date
   }) {
@@ -20,9 +22,16 @@ export class User implements UserServerModel {
     this.username = hash.username
     this.email = hash.email
     this.role = hash.role
-    this.displayNSFW = hash.displayNSFW
 
-    if (hash.createdAt) {
+    if (hash.videoQuota !== undefined) {
+      this.videoQuota = hash.videoQuota
+    }
+
+    if (hash.displayNSFW !== undefined) {
+      this.displayNSFW = hash.displayNSFW
+    }
+
+    if (hash.createdAt !== undefined) {
       this.createdAt = hash.createdAt
     }
   }