twhelp
/
shared
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add one more relation to PlayerHistoryFilter.WhereWithRelations (Player.Tribe)

This commit is contained in:
Dawid Wysokiński 2021-05-05 19:24:13 +02:00
parent 9aa09097fd
commit bf85190fd6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tw/twmodel/ennoblement.go
View File

@ -184,7 +184,7 @@ func (f *EnnoblementFilter) WhereWithRelations(q *orm.Query) (*orm.Query, error)
if f.NewOwnerTribeFilter != nil { if f.NewOwnerTribeFilter != nil {
filtersToAppend = append(filtersToAppend, filterToAppend{ filtersToAppend = append(filtersToAppend, filterToAppend{
filter: f.NewOwnerTribeFilter, filter: f.NewOwnerTribeFilter,
relationName: "newOwnerTribe", relationName: "NewOwnerTribe",
}) })
} }

6
tw/twmodel/player_history.go
View File

@ -87,6 +87,12 @@ func (f *PlayerHistoryFilter) WhereWithRelations(q *orm.Query) (*orm.Query, erro
filter: f.PlayerFilter, filter: f.PlayerFilter,
relationName: "Player", relationName: "Player",
}) })
if f.PlayerFilter.TribeFilter != nil {
filtersToAppend = append(filtersToAppend, filterToAppend{
filter: f.PlayerFilter.TribeFilter,
relationName: "Player.Tribe",
})
}
} }
return appendFilters(q, filtersToAppend...) return appendFilters(q, filtersToAppend...)