diff options
author | clementbrizard <clementbrizard53@gmail.com> | 2019-01-12 13:45:23 +0000 |
---|---|---|
committer | clementbrizard <clementbrizard53@gmail.com> | 2019-01-12 13:45:23 +0000 |
commit | 1e74f19a2179df7fc2e0da73163ef2c3118cbecb (patch) | |
tree | d00a7b500e5ffe4973f4ce4a52b85da28733ae28 /client/src/app | |
parent | c80341655fce5e70ad6da7d812e2ddeb1f8ef7f2 (diff) | |
download | PeerTube-1e74f19a2179df7fc2e0da73163ef2c3118cbecb.tar.gz PeerTube-1e74f19a2179df7fc2e0da73163ef2c3118cbecb.tar.zst PeerTube-1e74f19a2179df7fc2e0da73163ef2c3118cbecb.zip |
Enable video upload and edit
Diffstat (limited to 'client/src/app')
5 files changed, 29 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 7ae66ddfc..11a7694c8 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, |
@@ -83,7 +84,8 @@ export class VideoImportService { | |||
83 | commentsEnabled: video.commentsEnabled, | 84 | commentsEnabled: video.commentsEnabled, |
84 | thumbnailfile: video.thumbnailfile, | 85 | thumbnailfile: video.thumbnailfile, |
85 | previewfile: video.previewfile, | 86 | previewfile: video.previewfile, |
86 | scheduleUpdate | 87 | scheduleUpdate, |
88 | originallyPublishedAt | ||
87 | } | 89 | } |
88 | } | 90 | } |
89 | 91 | ||
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 55844f988..5d258891f 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, |
@@ -97,7 +98,8 @@ export class VideoService implements VideosProvider { | |||
97 | commentsEnabled: video.commentsEnabled, | 98 | commentsEnabled: video.commentsEnabled, |
98 | thumbnailfile: video.thumbnailfile, | 99 | thumbnailfile: video.thumbnailfile, |
99 | previewfile: video.previewfile, | 100 | previewfile: video.previewfile, |
100 | scheduleUpdate | 101 | scheduleUpdate, |
102 | originallyPublishedAt | ||
101 | } | 103 | } |
102 | 104 | ||
103 | const data = objectToFormData(body) | 105 | const data = objectToFormData(body) |
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 bd52d686a..23a71a068 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 | |||
@@ -114,6 +114,20 @@ | |||
114 | </div> | 114 | </div> |
115 | </div> | 115 | </div> |
116 | 116 | ||
117 | <div class="form-group"> | ||
118 | <label i18n for="originallyPublishedAt">Original publication date</label> | ||
119 | <my-help i18n-preHtml preHtml="This is the date when the content was originally published (e.g. the release date for a film)"></my-help> | ||
120 | <p-calendar | ||
121 | id="originallyPublishedAt" formControlName="originallyPublishedAt" [dateFormat]="calendarDateFormat" | ||
122 | [locale]="calendarLocale" [showTime]="true" [hideOnDateTimeSelect]="true" [monthNavigator]="true" [yearNavigator]="true" [yearRange]="myYearRange" | ||
123 | > | ||
124 | </p-calendar> | ||
125 | |||
126 | <div *ngIf="formErrors.originallyPublishedAt" class="form-error"> | ||
127 | {{ formErrors.originallyPublishedAt }} | ||
128 | </div> | ||
129 | </div> | ||
130 | |||
117 | <my-peertube-checkbox | 131 | <my-peertube-checkbox |
118 | inputName="nsfw" formControlName="nsfw" | 132 | inputName="nsfw" formControlName="nsfw" |
119 | i18n-labelText labelText="This video contains mature or explicit content" | 133 | i18n-labelText labelText="This video contains mature or explicit content" |
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 85e015901..d02f18ee9 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 | |||
@@ -45,6 +45,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
45 | 45 | ||
46 | calendarLocale: any = {} | 46 | calendarLocale: any = {} |
47 | minScheduledDate = new Date() | 47 | minScheduledDate = new Date() |
48 | myYearRange = '1880:' + (new Date()).getFullYear() | ||
48 | 49 | ||
49 | calendarTimezone: string | 50 | calendarTimezone: string |
50 | calendarDateFormat: string | 51 | calendarDateFormat: string |
@@ -99,7 +100,8 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
99 | thumbnailfile: null, | 100 | thumbnailfile: null, |
100 | previewfile: null, | 101 | previewfile: null, |
101 | support: this.videoValidatorsService.VIDEO_SUPPORT, | 102 | support: this.videoValidatorsService.VIDEO_SUPPORT, |
102 | schedulePublicationAt: this.videoValidatorsService.VIDEO_SCHEDULE_PUBLICATION_AT | 103 | schedulePublicationAt: this.videoValidatorsService.VIDEO_SCHEDULE_PUBLICATION_AT, |
104 | originallyPublishedAt: this.videoValidatorsService.VIDEO_ORIGINALLY_PUBLISHED_AT | ||
103 | } | 105 | } |
104 | 106 | ||
105 | this.formValidatorService.updateForm( | 107 | this.formValidatorService.updateForm( |