diff options
Diffstat (limited to 'client/src/app/core')
-rw-r--r-- | client/src/app/core/auth/auth.service.ts | 8 | ||||
-rw-r--r-- | client/src/app/core/menu/menu-admin.component.html | 5 | ||||
-rw-r--r-- | client/src/app/core/menu/menu-admin.component.ts | 6 | ||||
-rw-r--r-- | client/src/app/core/menu/menu.component.ts | 6 |
4 files changed, 7 insertions, 18 deletions
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 { | |||
42 | displayNSFW: boolean | 42 | displayNSFW: boolean |
43 | email: string | 43 | email: string |
44 | videoQuota: number | 44 | videoQuota: number |
45 | author: { | 45 | account: { |
46 | id: number | 46 | id: number |
47 | uuid: string | 47 | uuid: string |
48 | } | 48 | } |
@@ -208,7 +208,7 @@ export class AuthService { | |||
208 | this.user.displayNSFW = res.displayNSFW | 208 | this.user.displayNSFW = res.displayNSFW |
209 | this.user.role = res.role | 209 | this.user.role = res.role |
210 | this.user.videoChannels = res.videoChannels | 210 | this.user.videoChannels = res.videoChannels |
211 | this.user.author = res.author | 211 | this.user.account = res.account |
212 | 212 | ||
213 | this.user.save() | 213 | this.user.save() |
214 | } | 214 | } |
@@ -227,7 +227,7 @@ export class AuthService { | |||
227 | displayNSFW: res.displayNSFW, | 227 | displayNSFW: res.displayNSFW, |
228 | email: res.email, | 228 | email: res.email, |
229 | videoQuota: res.videoQuota, | 229 | videoQuota: res.videoQuota, |
230 | author: res.author, | 230 | account: res.account, |
231 | videoChannels: res.videoChannels | 231 | videoChannels: res.videoChannels |
232 | } | 232 | } |
233 | 233 | ||
@@ -245,7 +245,7 @@ export class AuthService { | |||
245 | displayNSFW: obj.displayNSFW, | 245 | displayNSFW: obj.displayNSFW, |
246 | videoQuota: obj.videoQuota, | 246 | videoQuota: obj.videoQuota, |
247 | videoChannels: obj.videoChannels, | 247 | videoChannels: obj.videoChannels, |
248 | author: obj.author | 248 | account: obj.account |
249 | } | 249 | } |
250 | const hashTokens = { | 250 | const hashTokens = { |
251 | accessToken: obj.access_token, | 251 | 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 @@ | |||
10 | List friends | 10 | List friends |
11 | </a> | 11 | </a> |
12 | 12 | ||
13 | <a *ngIf="hasRequestsStatRight()" routerLink="/admin/requests/stats" routerLinkActive="active"> | ||
14 | <span class="hidden-xs glyphicon glyphicon-stats"></span> | ||
15 | Request stats | ||
16 | </a> | ||
17 | |||
18 | <a *ngIf="hasVideoAbusesRight()" routerLink="/admin/video-abuses" routerLinkActive="active"> | 13 | <a *ngIf="hasVideoAbusesRight()" routerLink="/admin/video-abuses" routerLinkActive="active"> |
19 | <span class="hidden-xs glyphicon glyphicon-alert"></span> | 14 | <span class="hidden-xs glyphicon glyphicon-alert"></span> |
20 | Video abuses | 15 | 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 { | |||
16 | } | 16 | } |
17 | 17 | ||
18 | hasFriendsRight () { | 18 | hasFriendsRight () { |
19 | return this.auth.getUser().hasRight(UserRight.MANAGE_PODS) | 19 | return this.auth.getUser().hasRight(UserRight.MANAGE_PEERTUBE_FOLLOW) |
20 | } | ||
21 | |||
22 | hasRequestsStatRight () { | ||
23 | return this.auth.getUser().hasRight(UserRight.MANAGE_REQUEST_SCHEDULERS) | ||
24 | } | 20 | } |
25 | 21 | ||
26 | hasVideoAbusesRight () { | 22 | 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 { | |||
16 | 16 | ||
17 | private routesPerRight = { | 17 | private routesPerRight = { |
18 | [UserRight.MANAGE_USERS]: '/admin/users', | 18 | [UserRight.MANAGE_USERS]: '/admin/users', |
19 | [UserRight.MANAGE_PODS]: '/admin/friends', | 19 | [UserRight.MANAGE_PEERTUBE_FOLLOW]: '/admin/friends', |
20 | [UserRight.MANAGE_REQUEST_SCHEDULERS]: '/admin/requests/stats', | ||
21 | [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/video-abuses', | 20 | [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/video-abuses', |
22 | [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/video-blacklist' | 21 | [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/video-blacklist' |
23 | } | 22 | } |
@@ -59,8 +58,7 @@ export class MenuComponent implements OnInit { | |||
59 | 58 | ||
60 | const adminRights = [ | 59 | const adminRights = [ |
61 | UserRight.MANAGE_USERS, | 60 | UserRight.MANAGE_USERS, |
62 | UserRight.MANAGE_PODS, | 61 | UserRight.MANAGE_PEERTUBE_FOLLOW, |
63 | UserRight.MANAGE_REQUEST_SCHEDULERS, | ||
64 | UserRight.MANAGE_VIDEO_ABUSES, | 62 | UserRight.MANAGE_VIDEO_ABUSES, |
65 | UserRight.MANAGE_VIDEO_BLACKLIST | 63 | UserRight.MANAGE_VIDEO_BLACKLIST |
66 | ] | 64 | ] |