diff options
Diffstat (limited to 'client/src/app/+admin/users/user-list')
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.html | 2 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.ts | 37 |
2 files changed, 6 insertions, 33 deletions
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 63144502c..38445cee7 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html | |||
@@ -30,7 +30,7 @@ | |||
30 | </div> | 30 | </div> |
31 | <input | 31 | <input |
32 | type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." | 32 | type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." |
33 | (keyup)="onUserSearch($event)" | 33 | (keyup)="onSearch($event)" |
34 | > | 34 | > |
35 | <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetTableFilter()"></a> | 35 | <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetTableFilter()"></a> |
36 | <span class="sr-only" i18n>Clear filters</span> | 36 | <span class="sr-only" i18n>Clear filters</span> |
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index 86812f73d..9f92358a0 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts | |||
@@ -35,14 +35,14 @@ export class UserListComponent extends RestTable implements OnInit { | |||
35 | private serverConfig: ServerConfig | 35 | private serverConfig: ServerConfig |
36 | 36 | ||
37 | constructor ( | 37 | constructor ( |
38 | protected route: ActivatedRoute, | ||
39 | protected router: Router, | ||
38 | private notifier: Notifier, | 40 | private notifier: Notifier, |
39 | private confirmService: ConfirmService, | 41 | private confirmService: ConfirmService, |
40 | private serverService: ServerService, | 42 | private serverService: ServerService, |
41 | private userService: UserService, | ||
42 | private auth: AuthService, | 43 | private auth: AuthService, |
43 | private route: ActivatedRoute, | 44 | private userService: UserService |
44 | private router: Router | 45 | ) { |
45 | ) { | ||
46 | super() | 46 | super() |
47 | } | 47 | } |
48 | 48 | ||
@@ -68,14 +68,7 @@ export class UserListComponent extends RestTable implements OnInit { | |||
68 | .subscribe(config => this.serverConfig = config) | 68 | .subscribe(config => this.serverConfig = config) |
69 | 69 | ||
70 | this.initialize() | 70 | this.initialize() |
71 | 71 | this.listenToSearchChange() | |
72 | this.route.queryParams | ||
73 | .subscribe(params => { | ||
74 | this.search = params.search || '' | ||
75 | |||
76 | this.setTableFilter(this.search) | ||
77 | this.loadData() | ||
78 | }) | ||
79 | 72 | ||
80 | this.bulkUserActions = [ | 73 | this.bulkUserActions = [ |
81 | [ | 74 | [ |
@@ -170,26 +163,6 @@ export class UserListComponent extends RestTable implements OnInit { | |||
170 | this.loadData() | 163 | this.loadData() |
171 | } | 164 | } |
172 | 165 | ||
173 | /* Table filter functions */ | ||
174 | onUserSearch (event: Event) { | ||
175 | this.onSearch(event) | ||
176 | this.setQueryParams((event.target as HTMLInputElement).value) | ||
177 | } | ||
178 | |||
179 | setQueryParams (search: string) { | ||
180 | const queryParams: Params = {} | ||
181 | if (search) Object.assign(queryParams, { search }) | ||
182 | |||
183 | this.router.navigate([ '/admin/users/list' ], { queryParams }) | ||
184 | } | ||
185 | |||
186 | resetTableFilter () { | ||
187 | this.setTableFilter('') | ||
188 | this.setQueryParams('') | ||
189 | this.resetSearch() | ||
190 | } | ||
191 | /* END Table filter functions */ | ||
192 | |||
193 | switchToDefaultAvatar ($event: Event) { | 166 | switchToDefaultAvatar ($event: Event) { |
194 | ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL() | 167 | ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL() |
195 | } | 168 | } |