Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 08:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Fixed 0 for weight when a new performer is created and fixed the search is null (#1336)

Browse source
This commit is contained in:
julien0221 2021-04-26 03:13:50 +01:00 committed by GitHub
parent 7836a37d6e
commit f66010a367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphql/schema/types/filters.graphql
View file

@ -76,7 +76,7 @@ input PerformerFilterType {
"""Filter by hair color""" """Filter by hair color"""
hair_color: StringCriterionInput hair_color: StringCriterionInput
"""Filter by weight""" """Filter by weight"""
weight: StringCriterionInput weight: IntCriterionInput
"""Filter by death year""" """Filter by death year"""
death_year: IntCriterionInput death_year: IntCriterionInput
} }

2
pkg/sqlite/performer.go
View file

@ -260,8 +260,8 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos") query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos")
query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings") query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings")
query.handleStringCriterionInput(performerFilter.HairColor, tableName+".hair_color") query.handleStringCriterionInput(performerFilter.HairColor, tableName+".hair_color")
query.handleStringCriterionInput(performerFilter.Weight, tableName+".weight")
query.handleStringCriterionInput(performerFilter.URL, tableName+".url") query.handleStringCriterionInput(performerFilter.URL, tableName+".url")
query.handleIntCriterionInput(performerFilter.Weight, tableName+".weight")
// TODO - need better handling of aliases // TODO - need better handling of aliases
query.handleStringCriterionInput(performerFilter.Aliases, tableName+".aliases") query.handleStringCriterionInput(performerFilter.Aliases, tableName+".aliases")

2
ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
View file

@ -138,7 +138,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
details: performer.details ?? "", details: performer.details ?? "",
death_date: performer.death_date ?? "", death_date: performer.death_date ?? "",
hair_color: performer.hair_color ?? "", hair_color: performer.hair_color ?? "",
weight: performer.weight ?? "", weight: performer.weight ?? undefined,
}; };
type InputValues = typeof initialValues; type InputValues = typeof initialValues;

4
ui/v2.5/src/models/list-filter/filter.ts
View file

@ -209,6 +209,7 @@ export class ListFilterModel {
"birth_year", "birth_year",
"death_year", "death_year",
"age", "age",
"weight",
]; ];
const stringCriteria: CriterionType[] = [ const stringCriteria: CriterionType[] = [
"ethnicity", "ethnicity",
@ -216,7 +217,6 @@ export class ListFilterModel {
"hair_color", "hair_color",
"eye_color", "eye_color",
"height", "height",
"weight",
"measurements", "measurements",
"fake_tits", "fake_tits",
"career_length", "career_length",
@ -718,7 +718,7 @@ export class ListFilterModel {
break; break;
} }
case "weight": { case "weight": {
const wCrit = criterion as StringCriterion; const wCrit = criterion as NumberCriterion;
result.weight = { value: wCrit.value, modifier: wCrit.modifier }; result.weight = { value: wCrit.value, modifier: wCrit.modifier };
break; break;
} }