diff options
Diffstat (limited to 'client/src/app/shared')
-rw-r--r-- | client/src/app/shared/video/video-details.model.ts | 16 | ||||
-rw-r--r-- | client/src/app/shared/video/video-edit.model.ts | 3 | ||||
-rw-r--r-- | client/src/app/shared/video/video.service.ts | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/client/src/app/shared/video/video-details.model.ts b/client/src/app/shared/video/video-details.model.ts index 8243b9f1c..cf6b71b60 100644 --- a/client/src/app/shared/video/video-details.model.ts +++ b/client/src/app/shared/video/video-details.model.ts | |||
@@ -1,14 +1,10 @@ | |||
1 | import { Account } from '../../../../../shared/models/actors' | ||
2 | import { Video } from '../../shared/video/video.model' | ||
3 | import { AuthUser } from '../../core' | ||
4 | import { | 1 | import { |
5 | VideoDetails as VideoDetailsServerModel, | 2 | UserRight, VideoChannel, VideoDetails as VideoDetailsServerModel, VideoFile, VideoPrivacy, |
6 | VideoFile, | 3 | VideoResolution |
7 | VideoChannel, | ||
8 | VideoResolution, | ||
9 | UserRight, | ||
10 | VideoPrivacy | ||
11 | } from '../../../../../shared' | 4 | } from '../../../../../shared' |
5 | import { Account } from '../../../../../shared/models/actors' | ||
6 | import { AuthUser } from '../../core' | ||
7 | import { Video } from '../../shared/video/video.model' | ||
12 | 8 | ||
13 | export class VideoDetails extends Video implements VideoDetailsServerModel { | 9 | export class VideoDetails extends Video implements VideoDetailsServerModel { |
14 | accountName: string | 10 | accountName: string |
@@ -48,6 +44,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { | |||
48 | account: Account | 44 | account: Account |
49 | likesPercent: number | 45 | likesPercent: number |
50 | dislikesPercent: number | 46 | dislikesPercent: number |
47 | commentsEnabled: boolean | ||
51 | 48 | ||
52 | constructor (hash: VideoDetailsServerModel) { | 49 | constructor (hash: VideoDetailsServerModel) { |
53 | super(hash) | 50 | super(hash) |
@@ -59,6 +56,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { | |||
59 | this.channel = hash.channel | 56 | this.channel = hash.channel |
60 | this.account = hash.account | 57 | this.account = hash.account |
61 | this.tags = hash.tags | 58 | this.tags = hash.tags |
59 | this.commentsEnabled = hash.commentsEnabled | ||
62 | 60 | ||
63 | this.likesPercent = (this.likes / (this.likes + this.dislikes)) * 100 | 61 | this.likesPercent = (this.likes / (this.likes + this.dislikes)) * 100 |
64 | this.dislikesPercent = (this.dislikes / (this.likes + this.dislikes)) * 100 | 62 | this.dislikesPercent = (this.dislikes / (this.likes + this.dislikes)) * 100 |
diff --git a/client/src/app/shared/video/video-edit.model.ts b/client/src/app/shared/video/video-edit.model.ts index 47c63d976..b1c772217 100644 --- a/client/src/app/shared/video/video-edit.model.ts +++ b/client/src/app/shared/video/video-edit.model.ts | |||
@@ -9,6 +9,7 @@ export class VideoEdit { | |||
9 | name: string | 9 | name: string |
10 | tags: string[] | 10 | tags: string[] |
11 | nsfw: boolean | 11 | nsfw: boolean |
12 | commentsEnabled: boolean | ||
12 | channel: number | 13 | channel: number |
13 | privacy: VideoPrivacy | 14 | privacy: VideoPrivacy |
14 | uuid?: string | 15 | uuid?: string |
@@ -25,6 +26,7 @@ export class VideoEdit { | |||
25 | this.name = videoDetails.name | 26 | this.name = videoDetails.name |
26 | this.tags = videoDetails.tags | 27 | this.tags = videoDetails.tags |
27 | this.nsfw = videoDetails.nsfw | 28 | this.nsfw = videoDetails.nsfw |
29 | this.commentsEnabled = videoDetails.commentsEnabled | ||
28 | this.channel = videoDetails.channel.id | 30 | this.channel = videoDetails.channel.id |
29 | this.privacy = videoDetails.privacy | 31 | this.privacy = videoDetails.privacy |
30 | } | 32 | } |
@@ -45,6 +47,7 @@ export class VideoEdit { | |||
45 | name: this.name, | 47 | name: this.name, |
46 | tags: this.tags, | 48 | tags: this.tags, |
47 | nsfw: this.nsfw, | 49 | nsfw: this.nsfw, |
50 | commentsEnabled: this.commentsEnabled, | ||
48 | channelId: this.channel, | 51 | channelId: this.channel, |
49 | privacy: this.privacy | 52 | privacy: this.privacy |
50 | } | 53 | } |
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index fc7505a51..073acb2b6 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -55,7 +55,8 @@ export class VideoService { | |||
55 | description, | 55 | description, |
56 | privacy: video.privacy, | 56 | privacy: video.privacy, |
57 | tags: video.tags, | 57 | tags: video.tags, |
58 | nsfw: video.nsfw | 58 | nsfw: video.nsfw, |
59 | commentsEnabled: video.commentsEnabled | ||
59 | } | 60 | } |
60 | 61 | ||
61 | return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, body) | 62 | return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, body) |