X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-edit%2Fvideo-update.resolver.ts;h=524ceae109ff30e52ca614056054c81d7a0a5483;hb=a2fb5fb8b1007e3ce82e707917f5d9a37374e99b;hp=91e76b7fe31f09b3cc7562ec029eb97fa81d5d2f;hpb=9df52d660feb722404be00a50f3c8a612bec1c15;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+videos/+video-edit/video-update.resolver.ts b/client/src/app/+videos/+video-edit/video-update.resolver.ts index 91e76b7fe..524ceae10 100644 --- a/client/src/app/+videos/+video-edit/video-update.resolver.ts +++ b/client/src/app/+videos/+video-edit/video-update.resolver.ts @@ -3,7 +3,7 @@ import { map, switchMap } from 'rxjs/operators' import { Injectable } from '@angular/core' import { ActivatedRouteSnapshot, Resolve } from '@angular/router' import { AuthService } from '@app/core' -import { listUserChannels } from '@app/helpers' +import { listUserChannelsForSelect } from '@app/helpers' import { VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main' import { LiveVideoService } from '@app/shared/shared-video-live' @@ -23,7 +23,8 @@ export class VideoUpdateResolver implements Resolve { return this.videoService.getVideo({ videoId: uuid }) .pipe( switchMap(video => forkJoin(this.buildVideoObservables(video))), - map(([ video, videoChannels, videoCaptions, liveVideo ]) => ({ video, videoChannels, videoCaptions, liveVideo })) + map(([ video, videoSource, videoChannels, videoCaptions, liveVideo ]) => + ({ video, videoChannels, videoCaptions, videoSource, liveVideo })) ) } @@ -33,10 +34,12 @@ export class VideoUpdateResolver implements Resolve { .loadCompleteDescription(video.descriptionPath) .pipe(map(description => Object.assign(video, { description }))), - listUserChannels(this.authService), + this.videoService.getSource(video.id), + + listUserChannelsForSelect(this.authService), this.videoCaptionService - .listCaptions(video.id) + .listCaptions(video.uuid) .pipe( map(result => result.data) ),