aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/shared/video-import/video-import.service.ts2
-rw-r--r--client/src/app/shared/video/video-details.model.ts4
-rw-r--r--client/src/app/shared/video/video-edit.model.ts8
-rw-r--r--client/src/app/shared/video/video.service.ts2
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.html2
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.ts4
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts4
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts4
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts4
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts2
10 files changed, 18 insertions, 18 deletions
diff --git a/client/src/app/shared/video-import/video-import.service.ts b/client/src/app/shared/video-import/video-import.service.ts
index 74c458645..2163eb905 100644
--- a/client/src/app/shared/video-import/video-import.service.ts
+++ b/client/src/app/shared/video-import/video-import.service.ts
@@ -81,7 +81,7 @@ export class VideoImportService {
81 nsfw: video.nsfw, 81 nsfw: video.nsfw,
82 waitTranscoding: video.waitTranscoding, 82 waitTranscoding: video.waitTranscoding,
83 commentsEnabled: video.commentsEnabled, 83 commentsEnabled: video.commentsEnabled,
84 downloadingEnabled: video.downloadingEnabled, 84 downloadEnabled: video.downloadEnabled,
85 thumbnailfile: video.thumbnailfile, 85 thumbnailfile: video.thumbnailfile,
86 previewfile: video.previewfile, 86 previewfile: video.previewfile,
87 scheduleUpdate 87 scheduleUpdate
diff --git a/client/src/app/shared/video/video-details.model.ts b/client/src/app/shared/video/video-details.model.ts
index ad85641dc..5ff3926c4 100644
--- a/client/src/app/shared/video/video-details.model.ts
+++ b/client/src/app/shared/video/video-details.model.ts
@@ -12,7 +12,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
12 files: VideoFile[] 12 files: VideoFile[]
13 account: Account 13 account: Account
14 commentsEnabled: boolean 14 commentsEnabled: boolean
15 downloadingEnabled: boolean 15 downloadEnabled: boolean
16 16
17 waitTranscoding: boolean 17 waitTranscoding: boolean
18 state: VideoConstant<VideoState> 18 state: VideoConstant<VideoState>
@@ -30,7 +30,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
30 this.tags = hash.tags 30 this.tags = hash.tags
31 this.support = hash.support 31 this.support = hash.support
32 this.commentsEnabled = hash.commentsEnabled 32 this.commentsEnabled = hash.commentsEnabled
33 this.downloadingEnabled = hash.downloadingEnabled 33 this.downloadEnabled = hash.downloadEnabled
34 34
35 this.buildLikeAndDislikePercents() 35 this.buildLikeAndDislikePercents()
36 } 36 }
diff --git a/client/src/app/shared/video/video-edit.model.ts b/client/src/app/shared/video/video-edit.model.ts
index 47703ff79..e385004e5 100644
--- a/client/src/app/shared/video/video-edit.model.ts
+++ b/client/src/app/shared/video/video-edit.model.ts
@@ -14,7 +14,7 @@ export class VideoEdit implements VideoUpdate {
14 tags: string[] 14 tags: string[]
15 nsfw: boolean 15 nsfw: boolean
16 commentsEnabled: boolean 16 commentsEnabled: boolean
17 downloadingEnabled: boolean 17 downloadEnabled: boolean
18 waitTranscoding: boolean 18 waitTranscoding: boolean
19 channelId: number 19 channelId: number
20 privacy: VideoPrivacy 20 privacy: VideoPrivacy
@@ -27,7 +27,7 @@ export class VideoEdit implements VideoUpdate {
27 id?: number 27 id?: number
28 scheduleUpdate?: VideoScheduleUpdate 28 scheduleUpdate?: VideoScheduleUpdate
29 29
30 constructor (video?: Video & { tags: string[], commentsEnabled: boolean, downloadingEnabled: boolean, support: string, thumbnailUrl: string, previewUrl: string }) { 30 constructor (video?: Video & { tags: string[], commentsEnabled: boolean, downloadEnabled: boolean, support: string, thumbnailUrl: string, previewUrl: string }) {
31 if (video) { 31 if (video) {
32 this.id = video.id 32 this.id = video.id
33 this.uuid = video.uuid 33 this.uuid = video.uuid
@@ -39,7 +39,7 @@ export class VideoEdit implements VideoUpdate {
39 this.tags = video.tags 39 this.tags = video.tags
40 this.nsfw = video.nsfw 40 this.nsfw = video.nsfw
41 this.commentsEnabled = video.commentsEnabled 41 this.commentsEnabled = video.commentsEnabled
42 this.downloadingEnabled = video.downloadingEnabled 42 this.downloadEnabled = video.downloadEnabled
43 this.waitTranscoding = video.waitTranscoding 43 this.waitTranscoding = video.waitTranscoding
44 this.channelId = video.channel.id 44 this.channelId = video.channel.id
45 this.privacy = video.privacy.id 45 this.privacy = video.privacy.id
@@ -82,7 +82,7 @@ export class VideoEdit implements VideoUpdate {
82 tags: this.tags, 82 tags: this.tags,
83 nsfw: this.nsfw, 83 nsfw: this.nsfw,
84 commentsEnabled: this.commentsEnabled, 84 commentsEnabled: this.commentsEnabled,
85 downloadingEnabled: this.downloadingEnabled, 85 downloadEnabled: this.downloadEnabled,
86 waitTranscoding: this.waitTranscoding, 86 waitTranscoding: this.waitTranscoding,
87 channelId: this.channelId, 87 channelId: this.channelId,
88 privacy: this.privacy 88 privacy: this.privacy
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts
index c0339dd39..c9d6da7a4 100644
--- a/client/src/app/shared/video/video.service.ts
+++ b/client/src/app/shared/video/video.service.ts
@@ -95,7 +95,7 @@ export class VideoService implements VideosProvider {
95 nsfw: video.nsfw, 95 nsfw: video.nsfw,
96 waitTranscoding: video.waitTranscoding, 96 waitTranscoding: video.waitTranscoding,
97 commentsEnabled: video.commentsEnabled, 97 commentsEnabled: video.commentsEnabled,
98 downloadingEnabled: video.downloadingEnabled, 98 downloadEnabled: video.downloadEnabled,
99 thumbnailfile: video.thumbnailfile, 99 thumbnailfile: video.thumbnailfile,
100 previewfile: video.previewfile, 100 previewfile: video.previewfile,
101 scheduleUpdate 101 scheduleUpdate
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html
index 70d535055..8c74a1ca6 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -126,7 +126,7 @@
126 ></my-peertube-checkbox> 126 ></my-peertube-checkbox>
127 127
128 <my-peertube-checkbox 128 <my-peertube-checkbox
129 inputName="downloadingEnabled" formControlName="downloadingEnabled" 129 inputName="downloadEnabled" formControlName="downloadEnabled"
130 i18n-labelText labelText="Disable downloading" 130 i18n-labelText labelText="Disable downloading"
131 ></my-peertube-checkbox> 131 ></my-peertube-checkbox>
132 132
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index b09664376..1dae931e2 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -80,7 +80,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
80 const defaultValues = { 80 const defaultValues = {
81 nsfw: 'false', 81 nsfw: 'false',
82 commentsEnabled: 'true', 82 commentsEnabled: 'true',
83 downloadingEnabled: 'true', 83 downloadEnabled: 'true',
84 waitTranscoding: 'true', 84 waitTranscoding: 'true',
85 tags: [] 85 tags: []
86 } 86 }
@@ -90,7 +90,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
90 channelId: this.videoValidatorsService.VIDEO_CHANNEL, 90 channelId: this.videoValidatorsService.VIDEO_CHANNEL,
91 nsfw: null, 91 nsfw: null,
92 commentsEnabled: null, 92 commentsEnabled: null,
93 downloadingEnabled: null, 93 downloadEnabled: null,
94 waitTranscoding: null, 94 waitTranscoding: null,
95 category: this.videoValidatorsService.VIDEO_CATEGORY, 95 category: this.videoValidatorsService.VIDEO_CATEGORY,
96 licence: this.videoValidatorsService.VIDEO_LICENCE, 96 licence: this.videoValidatorsService.VIDEO_LICENCE,
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
index 57cf0e395..0f6fd17a9 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
@@ -77,7 +77,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Ca
77 privacy: this.firstStepPrivacyId, 77 privacy: this.firstStepPrivacyId,
78 waitTranscoding: false, 78 waitTranscoding: false,
79 commentsEnabled: true, 79 commentsEnabled: true,
80 downloadingEnabled: true, 80 downloadEnabled: true,
81 channelId: this.firstStepChannelId 81 channelId: this.firstStepChannelId
82 } 82 }
83 83
@@ -92,7 +92,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Ca
92 92
93 this.video = new VideoEdit(Object.assign(res.video, { 93 this.video = new VideoEdit(Object.assign(res.video, {
94 commentsEnabled: videoUpdate.commentsEnabled, 94 commentsEnabled: videoUpdate.commentsEnabled,
95 downloadingEnabled: videoUpdate.downloadingEnabled, 95 downloadEnabled: videoUpdate.downloadEnabled,
96 support: null, 96 support: null,
97 thumbnailUrl: null, 97 thumbnailUrl: null,
98 previewUrl: null 98 previewUrl: null
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
index 11db4a7ef..fbc85c74f 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
@@ -69,7 +69,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom
69 privacy: this.firstStepPrivacyId, 69 privacy: this.firstStepPrivacyId,
70 waitTranscoding: false, 70 waitTranscoding: false,
71 commentsEnabled: true, 71 commentsEnabled: true,
72 downloadingEnabled: true, 72 downloadEnabled: true,
73 channelId: this.firstStepChannelId 73 channelId: this.firstStepChannelId
74 } 74 }
75 75
@@ -84,7 +84,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom
84 84
85 this.video = new VideoEdit(Object.assign(res.video, { 85 this.video = new VideoEdit(Object.assign(res.video, {
86 commentsEnabled: videoUpdate.commentsEnabled, 86 commentsEnabled: videoUpdate.commentsEnabled,
87 downloadingEnabled: videoUpdate.downloadingEnabled, 87 downloadEnabled: videoUpdate.downloadEnabled,
88 support: null, 88 support: null,
89 thumbnailUrl: null, 89 thumbnailUrl: null,
90 previewUrl: null 90 previewUrl: null
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
index 53f72f4e6..ac6c1786f 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
@@ -159,7 +159,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
159 const nsfw = false 159 const nsfw = false
160 const waitTranscoding = true 160 const waitTranscoding = true
161 const commentsEnabled = true 161 const commentsEnabled = true
162 const downloadingEnabled = true 162 const downloadEnabled = true
163 const channelId = this.firstStepChannelId.toString() 163 const channelId = this.firstStepChannelId.toString()
164 164
165 const formData = new FormData() 165 const formData = new FormData()
@@ -168,7 +168,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
168 formData.append('privacy', VideoPrivacy.PRIVATE.toString()) 168 formData.append('privacy', VideoPrivacy.PRIVATE.toString())
169 formData.append('nsfw', '' + nsfw) 169 formData.append('nsfw', '' + nsfw)
170 formData.append('commentsEnabled', '' + commentsEnabled) 170 formData.append('commentsEnabled', '' + commentsEnabled)
171 formData.append('downloadingEnabled', '' + downloadingEnabled) 171 formData.append('downloadEnabled', '' + downloadEnabled)
172 formData.append('waitTranscoding', '' + waitTranscoding) 172 formData.append('waitTranscoding', '' + waitTranscoding)
173 formData.append('channelId', '' + channelId) 173 formData.append('channelId', '' + channelId)
174 formData.append('videofile', videofile) 174 formData.append('videofile', videofile)
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 7cc831ab1..a7fd45695 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -314,7 +314,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
314 } 314 }
315 315
316 isVideoDownloadable () { 316 isVideoDownloadable () {
317 return this.video && this.video.downloadingEnabled 317 return this.video && this.video.downloadEnabled
318 } 318 }
319 319
320 isVideoToImport () { 320 isVideoToImport () {