DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fixed 'born in undefined' on actor tile.

This commit is contained in:
DebaucheryLibrarian 2024-04-02 03:01:15 +02:00
parent 94cc3b38d5
commit 6dca6ab444
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/actors/tile.vue
View File

@ -57,7 +57,7 @@
<span <span
v-if="actor.origin?.country" v-if="actor.origin?.country"
:title="`Born in ${actor.origin.country.name}`" :title="`Born in ${actor.origin.country.alias || actor.origin.country.name}`"
class="country" class="country"
> >
{{ actor.origin.country.alpha2 }} {{ actor.origin.country.alpha2 }}

2
src/actors.js
View File

@ -43,12 +43,14 @@ export function curateActor(actor, context = {}) {
country: actor.birth_country_alpha2 && { country: actor.birth_country_alpha2 && {
alpha2: actor.birth_country_alpha2, alpha2: actor.birth_country_alpha2,
name: actor.birth_country_name, name: actor.birth_country_name,
alias: actor.birth_country_alias,
}, },
}, },
residence: actor.residence_country_alpha2 && { residence: actor.residence_country_alpha2 && {
country: actor.residence_country_alpha2 && { country: actor.residence_country_alpha2 && {
alpha2: actor.residence_country_alpha2, alpha2: actor.residence_country_alpha2,
name: actor.residence_country_name, name: actor.residence_country_name,
alias: actor.residence_country_alias,
}, },
}, },
avatar: actor.avatar && { avatar: actor.avatar && {

3
src/scenes.js
View File

@ -109,10 +109,13 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
.select( .select(
'actors.*', 'actors.*',
'actors_meta.*', 'actors_meta.*',
'countries.name as birth_country_name',
'countries.alias as birth_country_alias',
'releases_actors.release_id', 'releases_actors.release_id',
) )
.leftJoin('actors', 'actors.id', 'releases_actors.actor_id') .leftJoin('actors', 'actors.id', 'releases_actors.actor_id')
.leftJoin('actors_meta', 'actors_meta.actor_id', 'actors.id') .leftJoin('actors_meta', 'actors_meta.actor_id', 'actors.id')
.leftJoin('countries', 'countries.alpha2', 'actors.birth_country_alpha2')
.whereIn('release_id', sceneIds), .whereIn('release_id', sceneIds),
directors: knex('releases_directors') directors: knex('releases_directors')
.whereIn('release_id', sceneIds) .whereIn('release_id', sceneIds)