Compare commits

...

2 Commits

Author SHA1 Message Date
DebaucheryLibrarian 815cc7694a 0.17.11 2024-04-02 03:01:18 +02:00
DebaucheryLibrarian 6dca6ab444 Fixed 'born in undefined' on actor tile. 2024-04-02 03:01:15 +02:00
5 changed files with 9 additions and 4 deletions

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 }}

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.17.10", "version": "0.17.11",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.17.10", "version": "0.17.11",
"dependencies": { "dependencies": {
"@brillout/json-serializer": "^0.5.8", "@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5", "@dicebear/collection": "^7.0.5",

View File

@ -72,5 +72,5 @@
"postcss-custom-media": "^10.0.2", "postcss-custom-media": "^10.0.2",
"postcss-nesting": "^12.0.2" "postcss-nesting": "^12.0.2"
}, },
"version": "0.17.10" "version": "0.17.11"
} }

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 && {

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)