Fixing studio filter disabling & load from url

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

View File

@ -30,7 +30,9 @@
<ng-container>
<mat-form-field class="w-100 px-3" (click)="$event.stopPropagation();">
<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"
(optionSelected)="this.addFilter('studio', $event.option.value, false)"
[displayWith]="this.nameGetter">

View File

@ -94,7 +94,6 @@ export class ItemsGridComponent implements OnInit
}
else if (!slug)
this.filters.studio = null;
this.studioForm.setValue(this.filters.studio?.name ?? "None", {emitEvent: false});
}
updatePeopleFilterFromQuery(query: Params)
@ -200,7 +199,7 @@ export class ItemsGridComponent implements OnInit
}
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)
return;