diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-07-15 11:17:03 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-07-29 18:15:53 +0200 |
commit | bc99dfe54e093e69ba8fd06d36b36fbbda3f45de (patch) | |
tree | 2c13497b77928c2593310746e3ec33333e2b4d66 /client/src/app/shared | |
parent | 654a188f80fc1f089aa14837084664c908fe27d2 (diff) | |
download | PeerTube-bc99dfe54e093e69ba8fd06d36b36fbbda3f45de.tar.gz PeerTube-bc99dfe54e093e69ba8fd06d36b36fbbda3f45de.tar.zst PeerTube-bc99dfe54e093e69ba8fd06d36b36fbbda3f45de.zip |
variable columns for users list, more columns possible, badge display for statuses
Diffstat (limited to 'client/src/app/shared')
-rw-r--r-- | client/src/app/shared/shared-icons/global-icon.component.ts | 3 | ||||
-rw-r--r-- | client/src/app/shared/shared-main/video-channel/video-channel.service.ts | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts index 66adb7579..c58ef29fa 100644 --- a/client/src/app/shared/shared-icons/global-icon.component.ts +++ b/client/src/app/shared/shared-icons/global-icon.component.ts | |||
@@ -64,7 +64,8 @@ const icons = { | |||
64 | 'go': require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default, | 64 | 'go': require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default, |
65 | 'cross': require('!!raw-loader?!../../../assets/images/feather/x.svg').default, | 65 | 'cross': require('!!raw-loader?!../../../assets/images/feather/x.svg').default, |
66 | 'tick': require('!!raw-loader?!../../../assets/images/feather/check.svg').default, | 66 | 'tick': require('!!raw-loader?!../../../assets/images/feather/check.svg').default, |
67 | 'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default | 67 | 'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default, |
68 | 'columns': require('!!raw-loader?!../../../assets/images/feather/columns.svg').default | ||
68 | } | 69 | } |
69 | 70 | ||
70 | export type GlobalIconName = keyof typeof icons | 71 | export type GlobalIconName = keyof typeof icons |
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts index 5483e305f..64dcf638a 100644 --- a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts +++ b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts | |||
@@ -43,7 +43,8 @@ export class VideoChannelService { | |||
43 | listAccountVideoChannels ( | 43 | listAccountVideoChannels ( |
44 | account: Account, | 44 | account: Account, |
45 | componentPagination?: ComponentPaginationLight, | 45 | componentPagination?: ComponentPaginationLight, |
46 | withStats = false | 46 | withStats = false, |
47 | search?: string | ||
47 | ): Observable<ResultList<VideoChannel>> { | 48 | ): Observable<ResultList<VideoChannel>> { |
48 | const pagination = componentPagination | 49 | const pagination = componentPagination |
49 | ? this.restService.componentPaginationToRestPagination(componentPagination) | 50 | ? this.restService.componentPaginationToRestPagination(componentPagination) |
@@ -53,6 +54,10 @@ export class VideoChannelService { | |||
53 | params = this.restService.addRestGetParams(params, pagination) | 54 | params = this.restService.addRestGetParams(params, pagination) |
54 | params = params.set('withStats', withStats + '') | 55 | params = params.set('withStats', withStats + '') |
55 | 56 | ||
57 | if (search) { | ||
58 | params = params.set('search', search) | ||
59 | } | ||
60 | |||
56 | const url = AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels' | 61 | const url = AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels' |
57 | return this.authHttp.get<ResultList<VideoChannelServer>>(url, { params }) | 62 | return this.authHttp.get<ResultList<VideoChannelServer>>(url, { params }) |
58 | .pipe( | 63 | .pipe( |