aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/users/user.service.ts2
-rw-r--r--client/src/app/shared/video-playlist/video-add-to-playlist.component.html2
-rw-r--r--client/src/app/shared/video/abstract-video-list.ts2
-rw-r--r--client/src/app/shared/video/video-miniature.component.scss3
-rw-r--r--client/src/app/shared/video/video.service.ts5
5 files changed, 8 insertions, 6 deletions
diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts
index 41ee87197..051e0bfa4 100644
--- a/client/src/app/shared/users/user.service.ts
+++ b/client/src/app/shared/users/user.service.ts
@@ -88,7 +88,7 @@ export class UserService {
88 } 88 }
89 89
90 getMyVideoQuotaUsed () { 90 getMyVideoQuotaUsed () {
91 const url = UserService.BASE_USERS_URL + '/me/video-quota-used' 91 const url = UserService.BASE_USERS_URL + 'me/video-quota-used'
92 92
93 return this.authHttp.get<UserVideoQuota>(url) 93 return this.authHttp.get<UserVideoQuota>(url)
94 .pipe(catchError(err => this.restExtractor.handleError(err))) 94 .pipe(catchError(err => this.restExtractor.handleError(err)))
diff --git a/client/src/app/shared/video-playlist/video-add-to-playlist.component.html b/client/src/app/shared/video-playlist/video-add-to-playlist.component.html
index ba30953b9..6e0989227 100644
--- a/client/src/app/shared/video-playlist/video-add-to-playlist.component.html
+++ b/client/src/app/shared/video-playlist/video-add-to-playlist.component.html
@@ -42,7 +42,7 @@
42 </div> 42 </div>
43 43
44 <div class="input-container"> 44 <div class="input-container">
45 <input type="text" placeholder="Search playlists" [(ngModel)]="videoPlaylistSearch" (ngModelChange)="onVideoPlaylistSearchChanged()" /> 45 <input type="text" placeholder="Search playlists" i18n-placeholder [(ngModel)]="videoPlaylistSearch" (ngModelChange)="onVideoPlaylistSearchChanged()" />
46 </div> 46 </div>
47 47
48 <div class="playlists"> 48 <div class="playlists">
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index a2a12bec7..746359851 100644
--- a/client/src/app/shared/video/abstract-video-list.ts
+++ b/client/src/app/shared/video/abstract-video-list.ts
@@ -150,6 +150,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
150 this.getVideosObservable(this.pagination.currentPage).subscribe( 150 this.getVideosObservable(this.pagination.currentPage).subscribe(
151 ({ data, total }) => { 151 ({ data, total }) => {
152 this.pagination.totalItems = total 152 this.pagination.totalItems = total
153 this.videos = []
153 this.videos = this.videos.concat(data) 154 this.videos = this.videos.concat(data)
154 155
155 if (this.groupByDate) this.buildGroupedDateLabels() 156 if (this.groupByDate) this.buildGroupedDateLabels()
@@ -170,7 +171,6 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
170 171
171 reloadVideos () { 172 reloadVideos () {
172 this.pagination.currentPage = 1 173 this.pagination.currentPage = 1
173 this.videos = []
174 this.loadMoreVideos() 174 this.loadMoreVideos()
175 } 175 }
176 176
diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss
index 3988cc055..ac83c5dfa 100644
--- a/client/src/app/shared/video/video-miniature.component.scss
+++ b/client/src/app/shared/video/video-miniature.component.scss
@@ -100,7 +100,8 @@ $more-margin-right: 15px;
100 flex-direction: row; 100 flex-direction: row;
101 margin-bottom: 0; 101 margin-bottom: 0;
102 height: auto; 102 height: auto;
103 width: 100%; 103 display: flex;
104 flex-grow: 1;
104 105
105 my-video-thumbnail { 106 my-video-thumbnail {
106 margin-right: 10px; 107 margin-right: 10px;
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts
index 9adf46495..2dd47d74e 100644
--- a/client/src/app/shared/video/video.service.ts
+++ b/client/src/app/shared/video/video.service.ts
@@ -121,14 +121,15 @@ export class VideoService implements VideosProvider {
121 .pipe(catchError(err => this.restExtractor.handleError(err))) 121 .pipe(catchError(err => this.restExtractor.handleError(err)))
122 } 122 }
123 123
124 getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<ResultList<Video>> { 124 getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField, search?: string): Observable<ResultList<Video>> {
125 const pagination = this.restService.componentPaginationToRestPagination(videoPagination) 125 const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
126 126
127 let params = new HttpParams() 127 let params = new HttpParams()
128 params = this.restService.addRestGetParams(params, pagination, sort) 128 params = this.restService.addRestGetParams(params, pagination, sort)
129 params = this.restService.addObjectParams(params, { search })
129 130
130 return this.authHttp 131 return this.authHttp
131 .get<ResultList<Video>>(UserService.BASE_USERS_URL + '/me/videos', { params }) 132 .get<ResultList<Video>>(UserService.BASE_USERS_URL + 'me/videos', { params })
132 .pipe( 133 .pipe(
133 switchMap(res => this.extractVideos(res)), 134 switchMap(res => this.extractVideos(res)),
134 catchError(err => this.restExtractor.handleError(err)) 135 catchError(err => this.restExtractor.handleError(err))