OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix video channel videos url when scrolling

pull/1345/head
Chocobozzz 2018-11-15 17:12:41 +01:00
parent 8f9e8be1fc
commit 8cf9987334
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
View File

@ -25,7 +25,7 @@ import { ScreenService } from '@app/shared/misc/screen.service'
export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
titlePage: string titlePage: string
marginContent = false // Disable margin marginContent = false // Disable margin
currentRoute = '/video-channel/videos' currentRoute = '/video-channels/videos'
loadOnInit = false loadOnInit = false
private videoChannel: VideoChannel private videoChannel: VideoChannel
@ -55,7 +55,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
this.videoChannelSub = this.videoChannelService.videoChannelLoaded this.videoChannelSub = this.videoChannelService.videoChannelLoaded
.subscribe(videoChannel => { .subscribe(videoChannel => {
this.videoChannel = videoChannel this.videoChannel = videoChannel
this.currentRoute = '/video-channel/' + this.videoChannel.uuid + '/videos' this.currentRoute = '/video-channels/' + this.videoChannel.uuid + '/videos'
this.reloadVideos() this.reloadVideos()
this.generateSyndicationList() this.generateSyndicationList()

8
server/tests/api/server/handle-down.ts
View File

@ -5,7 +5,7 @@ import 'mocha'
import { JobState, Video } from '../../../../shared/models' import { JobState, Video } from '../../../../shared/models'
import { VideoPrivacy } from '../../../../shared/models/videos' import { VideoPrivacy } from '../../../../shared/models/videos'
import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, viewVideo } from '../../utils' import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, updateVideo, viewVideo } from '../../utils'
import { import {
flushAndRunMultipleServers, flushAndRunMultipleServers,
getVideosList, getVideosList,
@ -194,15 +194,15 @@ describe('Test handle downs', function () {
expect(res.body.data).to.have.lengthOf(2) expect(res.body.data).to.have.lengthOf(2)
}) })
it('Should send a view to server 3, and automatically fetch the video', async function () { it('Should send an update to server 3, and automatically fetch the video', async function () {
this.timeout(15000) this.timeout(15000)
const res1 = await getVideosList(servers[2].url) const res1 = await getVideosList(servers[2].url)
expect(res1.body.data).to.be.an('array') expect(res1.body.data).to.be.an('array')
expect(res1.body.data).to.have.lengthOf(11) expect(res1.body.data).to.have.lengthOf(11)
await viewVideo(servers[0].url, missedVideo1.uuid) await updateVideo(servers[0].url, servers[0].accessToken, missedVideo1.uuid, { })
await viewVideo(servers[0].url, unlistedVideo.uuid) await updateVideo(servers[0].url, servers[0].accessToken, unlistedVideo.uuid, { })
await waitJobs(servers) await waitJobs(servers)