aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-02-17 15:34:42 +0100
committerChocobozzz <me@florianbigard.com>2020-02-17 15:34:42 +0100
commit2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89 (patch)
treea814ca1ab71078abe008dae7afc646fb388ca1d8 /client/src/app
parent8d3fe90c3f3bfd43366ea41a2519431b9001e744 (diff)
parent1c5fbed2093c0462e40a092d49d761a043c50e98 (diff)
downloadPeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.gz
PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.tar.zst
PeerTube-2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89.zip
Merge branch 'release/2.1.0' into develop
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/core/server/server.service.ts7
-rw-r--r--client/src/app/shared/video-playlist/video-playlist.service.ts6
2 files changed, 11 insertions, 2 deletions
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index c0e1f08bb..e015d0e14 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -168,8 +168,11 @@ export class ServerService {
168 if (!this.configObservable) { 168 if (!this.configObservable) {
169 this.configObservable = this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL) 169 this.configObservable = this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
170 .pipe( 170 .pipe(
171 tap(this.saveConfigLocally), 171 tap(config => this.saveConfigLocally(config)),
172 tap(() => this.configLoaded = true), 172 tap(config => {
173 this.config = config
174 this.configLoaded = true
175 }),
173 tap(() => { 176 tap(() => {
174 if (this.configReset) { 177 if (this.configReset) {
175 this.configReloaded.next() 178 this.configReloaded.next()
diff --git a/client/src/app/shared/video-playlist/video-playlist.service.ts b/client/src/app/shared/video-playlist/video-playlist.service.ts
index bae6f9e04..38d915c6b 100644
--- a/client/src/app/shared/video-playlist/video-playlist.service.ts
+++ b/client/src/app/shared/video-playlist/video-playlist.service.ts
@@ -141,6 +141,8 @@ export class VideoPlaylistService {
141 return this.authHttp.post<{ videoPlaylist: { id: number } }>(VideoPlaylistService.BASE_VIDEO_PLAYLIST_URL, data) 141 return this.authHttp.post<{ videoPlaylist: { id: number } }>(VideoPlaylistService.BASE_VIDEO_PLAYLIST_URL, data)
142 .pipe( 142 .pipe(
143 tap(res => { 143 tap(res => {
144 if (!this.myAccountPlaylistCache) return
145
144 this.myAccountPlaylistCache.total++ 146 this.myAccountPlaylistCache.total++
145 147
146 this.myAccountPlaylistCache.data.push({ 148 this.myAccountPlaylistCache.data.push({
@@ -161,6 +163,8 @@ export class VideoPlaylistService {
161 .pipe( 163 .pipe(
162 map(this.restExtractor.extractDataBool), 164 map(this.restExtractor.extractDataBool),
163 tap(() => { 165 tap(() => {
166 if (!this.myAccountPlaylistCache) return
167
164 const playlist = this.myAccountPlaylistCache.data.find(p => p.id === videoPlaylist.id) 168 const playlist = this.myAccountPlaylistCache.data.find(p => p.id === videoPlaylist.id)
165 playlist.displayName = body.displayName 169 playlist.displayName = body.displayName
166 170
@@ -175,6 +179,8 @@ export class VideoPlaylistService {
175 .pipe( 179 .pipe(
176 map(this.restExtractor.extractDataBool), 180 map(this.restExtractor.extractDataBool),
177 tap(() => { 181 tap(() => {
182 if (!this.myAccountPlaylistCache) return
183
178 this.myAccountPlaylistCache.total-- 184 this.myAccountPlaylistCache.total--
179 this.myAccountPlaylistCache.data = this.myAccountPlaylistCache.data 185 this.myAccountPlaylistCache.data = this.myAccountPlaylistCache.data
180 .filter(p => p.id !== videoPlaylist.id) 186 .filter(p => p.id !== videoPlaylist.id)