diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql index 8c1da2506..b0d124bbe 100644 --- a/graphql/schema/types/filters.graphql +++ b/graphql/schema/types/filters.graphql @@ -76,7 +76,7 @@ input PerformerFilterType { """Filter by hair color""" hair_color: StringCriterionInput """Filter by weight""" - weight: StringCriterionInput + weight: IntCriterionInput """Filter by death year""" death_year: IntCriterionInput } diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go index bbfcbee92..17406eb7c 100644 --- a/pkg/sqlite/performer.go +++ b/pkg/sqlite/performer.go @@ -260,8 +260,8 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos") query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings") query.handleStringCriterionInput(performerFilter.HairColor, tableName+".hair_color") - query.handleStringCriterionInput(performerFilter.Weight, tableName+".weight") query.handleStringCriterionInput(performerFilter.URL, tableName+".url") + query.handleIntCriterionInput(performerFilter.Weight, tableName+".weight") // TODO - need better handling of aliases query.handleStringCriterionInput(performerFilter.Aliases, tableName+".aliases") diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx index 499f1cae7..cf5916340 100644 --- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx +++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx @@ -138,7 +138,7 @@ export const PerformerEditPanel: React.FC = ({ details: performer.details ?? "", death_date: performer.death_date ?? "", hair_color: performer.hair_color ?? "", - weight: performer.weight ?? "", + weight: performer.weight ?? undefined, }; type InputValues = typeof initialValues; diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts index 917aa07e2..70dc2fee1 100644 --- a/ui/v2.5/src/models/list-filter/filter.ts +++ b/ui/v2.5/src/models/list-filter/filter.ts @@ -209,6 +209,7 @@ export class ListFilterModel { "birth_year", "death_year", "age", + "weight", ]; const stringCriteria: CriterionType[] = [ "ethnicity", @@ -216,7 +217,6 @@ export class ListFilterModel { "hair_color", "eye_color", "height", - "weight", "measurements", "fake_tits", "career_length", @@ -718,7 +718,7 @@ export class ListFilterModel { break; } case "weight": { - const wCrit = criterion as StringCriterion; + const wCrit = criterion as NumberCriterion; result.weight = { value: wCrit.value, modifier: wCrit.modifier }; break; }