Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing studio filter disabling & load from url

Browse Source
This commit is contained in:
Zoe Roux 2020-10-08 23:10:55 +02:00
parent 8159d8dd4c
commit de8fed8694
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/components/items-grid/items-grid.component.html
View File

@ -30,7 +30,9 @@
<ng-container> <ng-container>
<mat-form-field class="w-100 px-3" (click)="$event.stopPropagation();"> <mat-form-field class="w-100 px-3" (click)="$event.stopPropagation();">
<mat-label>Studio</mat-label> <mat-label>Studio</mat-label>
<input type="text" matInput [matAutocomplete]="autoStudio" [formControl]="studioForm" placeholder="None"> <input type="text" matInput [formControl]="studioForm"
[matAutocomplete]="autoStudio"
[value]="this.nameGetter(this.filters.studio)">
<mat-autocomplete autoActiveFirstOption #autoStudio="matAutocomplete" <mat-autocomplete autoActiveFirstOption #autoStudio="matAutocomplete"
(optionSelected)="this.addFilter('studio', $event.option.value, false)" (optionSelected)="this.addFilter('studio', $event.option.value, false)"
[displayWith]="this.nameGetter"> [displayWith]="this.nameGetter">

3
src/app/components/items-grid/items-grid.component.ts
View File

@ -94,7 +94,6 @@ export class ItemsGridComponent implements OnInit
} }
else if (!slug) else if (!slug)
this.filters.studio = null; this.filters.studio = null;
this.studioForm.setValue(this.filters.studio?.name ?? "None", {emitEvent: false});
} }
updatePeopleFilterFromQuery(query: Params) updatePeopleFilterFromQuery(query: Params)
@ -200,7 +199,7 @@ export class ItemsGridComponent implements OnInit
} }
else else
{ {
if (this.filters[category] == filter || this.filters[category]?.slug == filter.slug) if (filter && (this.filters[category] == filter || this.filters[category]?.slug == filter.slug))
{ {
if (!toggle) if (!toggle)
return; return;