diff --git a/tw/twmodel/ennoblement.go b/tw/twmodel/ennoblement.go index a883c0f..58b5240 100644 --- a/tw/twmodel/ennoblement.go +++ b/tw/twmodel/ennoblement.go @@ -184,7 +184,7 @@ func (f *EnnoblementFilter) WhereWithRelations(q *orm.Query) (*orm.Query, error) if f.NewOwnerTribeFilter != nil { filtersToAppend = append(filtersToAppend, filterToAppend{ filter: f.NewOwnerTribeFilter, - relationName: "newOwnerTribe", + relationName: "NewOwnerTribe", }) } diff --git a/tw/twmodel/player_history.go b/tw/twmodel/player_history.go index fb91c8c..5bf3693 100644 --- a/tw/twmodel/player_history.go +++ b/tw/twmodel/player_history.go @@ -87,6 +87,12 @@ func (f *PlayerHistoryFilter) WhereWithRelations(q *orm.Query) (*orm.Query, erro filter: f.PlayerFilter, relationName: "Player", }) + if f.PlayerFilter.TribeFilter != nil { + filtersToAppend = append(filtersToAppend, filterToAppend{ + filter: f.PlayerFilter.TribeFilter, + relationName: "Player.Tribe", + }) + } } return appendFilters(q, filtersToAppend...)