diff options
Diffstat (limited to 'client/src/app/shared')
5 files changed, 26 insertions, 3 deletions
diff --git a/client/src/app/shared/forms/form-validators/video-validators.service.ts b/client/src/app/shared/forms/form-validators/video-validators.service.ts index 81ed0666f..e3f7a0969 100644 --- a/client/src/app/shared/forms/form-validators/video-validators.service.ts +++ b/client/src/app/shared/forms/form-validators/video-validators.service.ts | |||
@@ -16,6 +16,7 @@ export class VideoValidatorsService { | |||
16 | readonly VIDEO_TAGS: BuildFormValidator | 16 | readonly VIDEO_TAGS: BuildFormValidator |
17 | readonly VIDEO_SUPPORT: BuildFormValidator | 17 | readonly VIDEO_SUPPORT: BuildFormValidator |
18 | readonly VIDEO_SCHEDULE_PUBLICATION_AT: BuildFormValidator | 18 | readonly VIDEO_SCHEDULE_PUBLICATION_AT: BuildFormValidator |
19 | readonly VIDEO_ORIGINALLY_PUBLISHED_AT: BuildFormValidator | ||
19 | 20 | ||
20 | constructor (private i18n: I18n) { | 21 | constructor (private i18n: I18n) { |
21 | 22 | ||
@@ -92,5 +93,10 @@ export class VideoValidatorsService { | |||
92 | 'required': this.i18n('A date is required to schedule video update.') | 93 | 'required': this.i18n('A date is required to schedule video update.') |
93 | } | 94 | } |
94 | } | 95 | } |
96 | |||
97 | this.VIDEO_ORIGINALLY_PUBLISHED_AT = { | ||
98 | VALIDATORS: [ ], | ||
99 | MESSAGES: {} | ||
100 | } | ||
95 | } | 101 | } |
96 | } | 102 | } |
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 2163eb905..7ae13154d 100644 --- a/client/src/app/shared/video-import/video-import.service.ts +++ b/client/src/app/shared/video-import/video-import.service.ts | |||
@@ -67,6 +67,7 @@ export class VideoImportService { | |||
67 | const description = video.description || null | 67 | const description = video.description || null |
68 | const support = video.support || null | 68 | const support = video.support || null |
69 | const scheduleUpdate = video.scheduleUpdate || null | 69 | const scheduleUpdate = video.scheduleUpdate || null |
70 | const originallyPublishedAt = video.originallyPublishedAt || null | ||
70 | 71 | ||
71 | return { | 72 | return { |
72 | name: video.name, | 73 | name: video.name, |
@@ -84,7 +85,8 @@ export class VideoImportService { | |||
84 | downloadEnabled: video.downloadEnabled, | 85 | downloadEnabled: video.downloadEnabled, |
85 | thumbnailfile: video.thumbnailfile, | 86 | thumbnailfile: video.thumbnailfile, |
86 | previewfile: video.previewfile, | 87 | previewfile: video.previewfile, |
87 | scheduleUpdate | 88 | scheduleUpdate, |
89 | originallyPublishedAt | ||
88 | } | 90 | } |
89 | } | 91 | } |
90 | 92 | ||
diff --git a/client/src/app/shared/video/video-edit.model.ts b/client/src/app/shared/video/video-edit.model.ts index 18c62a1f9..c5d5bb406 100644 --- a/client/src/app/shared/video/video-edit.model.ts +++ b/client/src/app/shared/video/video-edit.model.ts | |||
@@ -26,6 +26,7 @@ export class VideoEdit implements VideoUpdate { | |||
26 | uuid?: string | 26 | uuid?: string |
27 | id?: number | 27 | id?: number |
28 | scheduleUpdate?: VideoScheduleUpdate | 28 | scheduleUpdate?: VideoScheduleUpdate |
29 | originallyPublishedAt?: Date | string | ||
29 | 30 | ||
30 | constructor ( | 31 | constructor ( |
31 | video?: Video & { | 32 | video?: Video & { |
@@ -56,6 +57,7 @@ export class VideoEdit implements VideoUpdate { | |||
56 | this.previewUrl = video.previewUrl | 57 | this.previewUrl = video.previewUrl |
57 | 58 | ||
58 | this.scheduleUpdate = video.scheduledUpdate | 59 | this.scheduleUpdate = video.scheduledUpdate |
60 | this.originallyPublishedAt = new Date(video.originallyPublishedAt) | ||
59 | } | 61 | } |
60 | } | 62 | } |
61 | 63 | ||
@@ -77,6 +79,12 @@ export class VideoEdit implements VideoUpdate { | |||
77 | } else { | 79 | } else { |
78 | this.scheduleUpdate = null | 80 | this.scheduleUpdate = null |
79 | } | 81 | } |
82 | |||
83 | // Convert originallyPublishedAt to string so that function objectToFormData() works correctly | ||
84 | if (this.originallyPublishedAt) { | ||
85 | const originallyPublishedAt = new Date(values['originallyPublishedAt']) | ||
86 | this.originallyPublishedAt = originallyPublishedAt.toISOString() | ||
87 | } | ||
80 | } | 88 | } |
81 | 89 | ||
82 | toFormPatch () { | 90 | toFormPatch () { |
@@ -93,7 +101,8 @@ export class VideoEdit implements VideoUpdate { | |||
93 | downloadEnabled: this.downloadEnabled, | 101 | downloadEnabled: this.downloadEnabled, |
94 | waitTranscoding: this.waitTranscoding, | 102 | waitTranscoding: this.waitTranscoding, |
95 | channelId: this.channelId, | 103 | channelId: this.channelId, |
96 | privacy: this.privacy | 104 | privacy: this.privacy, |
105 | originallyPublishedAt: this.originallyPublishedAt | ||
97 | } | 106 | } |
98 | 107 | ||
99 | // Special case if we scheduled an update | 108 | // Special case if we scheduled an update |
diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index 6ea83d13b..460c09258 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts | |||
@@ -17,6 +17,7 @@ export class Video implements VideoServerModel { | |||
17 | createdAt: Date | 17 | createdAt: Date |
18 | updatedAt: Date | 18 | updatedAt: Date |
19 | publishedAt: Date | 19 | publishedAt: Date |
20 | originallyPublishedAt: Date | string | ||
20 | category: VideoConstant<number> | 21 | category: VideoConstant<number> |
21 | licence: VideoConstant<number> | 22 | licence: VideoConstant<number> |
22 | language: VideoConstant<string> | 23 | language: VideoConstant<string> |
@@ -116,6 +117,9 @@ export class Video implements VideoServerModel { | |||
116 | this.privacy.label = peertubeTranslate(this.privacy.label, translations) | 117 | this.privacy.label = peertubeTranslate(this.privacy.label, translations) |
117 | 118 | ||
118 | this.scheduledUpdate = hash.scheduledUpdate | 119 | this.scheduledUpdate = hash.scheduledUpdate |
120 | this.originallyPublishedAt = hash.originallyPublishedAt ? | ||
121 | new Date(hash.originallyPublishedAt.toString()) | ||
122 | : null | ||
119 | if (this.state) this.state.label = peertubeTranslate(this.state.label, translations) | 123 | if (this.state) this.state.label = peertubeTranslate(this.state.label, translations) |
120 | 124 | ||
121 | this.blacklisted = hash.blacklisted | 125 | this.blacklisted = hash.blacklisted |
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 565aad93b..960846e21 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -81,6 +81,7 @@ export class VideoService implements VideosProvider { | |||
81 | const description = video.description || null | 81 | const description = video.description || null |
82 | const support = video.support || null | 82 | const support = video.support || null |
83 | const scheduleUpdate = video.scheduleUpdate || null | 83 | const scheduleUpdate = video.scheduleUpdate || null |
84 | const originallyPublishedAt = video.originallyPublishedAt || null | ||
84 | 85 | ||
85 | const body: VideoUpdate = { | 86 | const body: VideoUpdate = { |
86 | name: video.name, | 87 | name: video.name, |
@@ -98,7 +99,8 @@ export class VideoService implements VideosProvider { | |||
98 | downloadEnabled: video.downloadEnabled, | 99 | downloadEnabled: video.downloadEnabled, |
99 | thumbnailfile: video.thumbnailfile, | 100 | thumbnailfile: video.thumbnailfile, |
100 | previewfile: video.previewfile, | 101 | previewfile: video.previewfile, |
101 | scheduleUpdate | 102 | scheduleUpdate, |
103 | originallyPublishedAt | ||
102 | } | 104 | } |
103 | 105 | ||
104 | const data = objectToFormData(body) | 106 | const data = objectToFormData(body) |