From 471ee42c0e2c5a0ad5e17f41cb13b91c6c666cea Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Fri, 23 Jan 2026 02:13:53 +0100 Subject: [PATCH] Showing networks first in child entity list. --- pages/entities/@entitySlug/+Page.vue | 18 ------------------ src/entities.js | 1 + static | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/pages/entities/@entitySlug/+Page.vue b/pages/entities/@entitySlug/+Page.vue index 114382e..48962d6 100644 --- a/pages/entities/@entitySlug/+Page.vue +++ b/pages/entities/@entitySlug/+Page.vue @@ -169,24 +169,6 @@ const entityUrl = (() => { } return entity.affiliateUrl || entity.url; - - /* - // affiliate might be inherited, only use full URL when directly associated - if (entity.affiliate?.url && entity.affiliate.entityId === entity.id) { - return entity.affiliate.url; - } - - if (entity.affiliate?.parameters) { - const newParams = new URLSearchParams({ - ...Object.fromEntries(new URL(entity.url).searchParams), - ...Object.fromEntries(new URLSearchParams(entity.affiliate.parameters)), - }); - - return `${entity.url}?${newParams}`; - } - - return entity.url; - */ })(); diff --git a/src/entities.js b/src/entities.js index f82f385..16cc6b5 100644 --- a/src/entities.js +++ b/src/entities.js @@ -119,6 +119,7 @@ export async function fetchEntitiesById(entityIds, options = {}, reqUser) { .whereIn('entities.parent_id', entityIds) .whereNot('type', 'info') .orderBy([ + { column: knex.raw('array_position(array[\'network\', \'channel\']::varchar[], type)'), order: 'asc' }, { column: 'independent', order: 'desc' }, { column: 'slug', order: 'asc' }, ]) : [], diff --git a/static b/static index 8ba0b20..d1ce4d1 160000 --- a/static +++ b/static @@ -1 +1 @@ -Subproject commit 8ba0b203fad2fa85624590a2547c1ae71f8fb481 +Subproject commit d1ce4d12582582adad789c7bc1d347f9257b644c