aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-07 13:43:48 +0200
committerChocobozzz <me@florianbigard.com>2020-08-07 13:43:48 +0200
commit951b582f52d0694865f020f0e53ccfad2d2d6033 (patch)
treee82f6eaf08a2add25a7807135a5b2351819ab3a0 /server
parent4891e4c77b72ac5a2f9d3d761a71eebe26d81357 (diff)
downloadPeerTube-951b582f52d0694865f020f0e53ccfad2d2d6033.tar.gz
PeerTube-951b582f52d0694865f020f0e53ccfad2d2d6033.tar.zst
PeerTube-951b582f52d0694865f020f0e53ccfad2d2d6033.zip
Add ability to share playlists in modal
Diffstat (limited to 'server')
-rw-r--r--server/models/video/video-playlist.ts1
-rw-r--r--server/tests/api/videos/video-playlists.ts3
2 files changed, 3 insertions, 1 deletions
diff --git a/server/models/video/video-playlist.ts b/server/models/video/video-playlist.ts
index f935bf4f0..581179640 100644
--- a/server/models/video/video-playlist.ts
+++ b/server/models/video/video-playlist.ts
@@ -528,6 +528,7 @@ export class VideoPlaylistModel extends Model<VideoPlaylistModel> {
528 }, 528 },
529 529
530 thumbnailPath: this.getThumbnailStaticPath(), 530 thumbnailPath: this.getThumbnailStaticPath(),
531 embedPath: this.getEmbedStaticPath(),
531 532
532 type: { 533 type: {
533 id: this.type, 534 id: this.type,
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts
index 2bb97d7a8..52b32998d 100644
--- a/server/tests/api/videos/video-playlists.ts
+++ b/server/tests/api/videos/video-playlists.ts
@@ -236,7 +236,7 @@ describe('Test video playlists', function () {
236 const playlistFromList = res.body.data[0] as VideoPlaylist 236 const playlistFromList = res.body.data[0] as VideoPlaylist
237 237
238 const res2 = await getVideoPlaylist(server.url, playlistFromList.uuid) 238 const res2 = await getVideoPlaylist(server.url, playlistFromList.uuid)
239 const playlistFromGet = res2.body 239 const playlistFromGet = res2.body as VideoPlaylist
240 240
241 for (const playlist of [ playlistFromGet, playlistFromList ]) { 241 for (const playlist of [ playlistFromGet, playlistFromList ]) {
242 expect(playlist.id).to.be.a('number') 242 expect(playlist.id).to.be.a('number')
@@ -250,6 +250,7 @@ describe('Test video playlists', function () {
250 expect(playlist.privacy.label).to.equal('Public') 250 expect(playlist.privacy.label).to.equal('Public')
251 expect(playlist.type.id).to.equal(VideoPlaylistType.REGULAR) 251 expect(playlist.type.id).to.equal(VideoPlaylistType.REGULAR)
252 expect(playlist.type.label).to.equal('Regular') 252 expect(playlist.type.label).to.equal('Regular')
253 expect(playlist.embedPath).to.equal('/video-playlists/embed/' + playlist.uuid)
253 254
254 expect(playlist.videosLength).to.equal(0) 255 expect(playlist.videosLength).to.equal(0)
255 256