From 1e1265b36c09df1465aa2b4866815c957b6a532e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 14 Nov 2017 09:31:41 +0100 Subject: Make the client compile too --- client/src/app/core/auth/auth.service.ts | 8 ++++---- client/src/app/core/menu/menu-admin.component.html | 5 ----- client/src/app/core/menu/menu-admin.component.ts | 6 +----- client/src/app/core/menu/menu.component.ts | 6 ++---- 4 files changed, 7 insertions(+), 18 deletions(-) (limited to 'client/src/app/core') diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 913c857e3..0aa276c69 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -42,7 +42,7 @@ interface UserLoginWithUserInformation extends UserLogin { displayNSFW: boolean email: string videoQuota: number - author: { + account: { id: number uuid: string } @@ -208,7 +208,7 @@ export class AuthService { this.user.displayNSFW = res.displayNSFW this.user.role = res.role this.user.videoChannels = res.videoChannels - this.user.author = res.author + this.user.account = res.account this.user.save() } @@ -227,7 +227,7 @@ export class AuthService { displayNSFW: res.displayNSFW, email: res.email, videoQuota: res.videoQuota, - author: res.author, + account: res.account, videoChannels: res.videoChannels } @@ -245,7 +245,7 @@ export class AuthService { displayNSFW: obj.displayNSFW, videoQuota: obj.videoQuota, videoChannels: obj.videoChannels, - author: obj.author + account: obj.account } const hashTokens = { accessToken: obj.access_token, diff --git a/client/src/app/core/menu/menu-admin.component.html b/client/src/app/core/menu/menu-admin.component.html index c2b2958b4..1966a944c 100644 --- a/client/src/app/core/menu/menu-admin.component.html +++ b/client/src/app/core/menu/menu-admin.component.html @@ -10,11 +10,6 @@ List friends - - - Request stats - - Video abuses diff --git a/client/src/app/core/menu/menu-admin.component.ts b/client/src/app/core/menu/menu-admin.component.ts index 074f1dbaf..92aab9a05 100644 --- a/client/src/app/core/menu/menu-admin.component.ts +++ b/client/src/app/core/menu/menu-admin.component.ts @@ -16,11 +16,7 @@ export class MenuAdminComponent { } hasFriendsRight () { - return this.auth.getUser().hasRight(UserRight.MANAGE_PODS) - } - - hasRequestsStatRight () { - return this.auth.getUser().hasRight(UserRight.MANAGE_REQUEST_SCHEDULERS) + return this.auth.getUser().hasRight(UserRight.MANAGE_PEERTUBE_FOLLOW) } hasVideoAbusesRight () { diff --git a/client/src/app/core/menu/menu.component.ts b/client/src/app/core/menu/menu.component.ts index c66a5eccc..71295be86 100644 --- a/client/src/app/core/menu/menu.component.ts +++ b/client/src/app/core/menu/menu.component.ts @@ -16,8 +16,7 @@ export class MenuComponent implements OnInit { private routesPerRight = { [UserRight.MANAGE_USERS]: '/admin/users', - [UserRight.MANAGE_PODS]: '/admin/friends', - [UserRight.MANAGE_REQUEST_SCHEDULERS]: '/admin/requests/stats', + [UserRight.MANAGE_PEERTUBE_FOLLOW]: '/admin/friends', [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/video-abuses', [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/video-blacklist' } @@ -59,8 +58,7 @@ export class MenuComponent implements OnInit { const adminRights = [ UserRight.MANAGE_USERS, - UserRight.MANAGE_PODS, - UserRight.MANAGE_REQUEST_SCHEDULERS, + UserRight.MANAGE_PEERTUBE_FOLLOW, UserRight.MANAGE_VIDEO_ABUSES, UserRight.MANAGE_VIDEO_BLACKLIST ] -- cgit v1.2.3