From 69acae4ed297c0d13338e3fe07fef71c86b66961 Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Sat, 8 Jan 2022 21:24:44 +0200 Subject: [PATCH] Fix owner stuff for pledges --- server/router/pledges/index.js | 24 ++++++++++++++++++++++-- server/views/pledge.pug | 2 +- server/views/pledges.pug | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/server/router/pledges/index.js b/server/router/pledges/index.js index a823baa..c8fec6b 100644 --- a/server/router/pledges/index.js +++ b/server/router/pledges/index.js @@ -12,7 +12,17 @@ module.exports = function (options) { association: db.Pledge.TranslationArtifactVersionPledges }, { - association: db.Pledge.Entity + association: db.Pledge.Owner, + include: [ + { + association: db.Owner.OwnerEntity, + include: [ + { + association: db.OwnerEntity.Entity + } + ] + } + ] } ] }).then(pledges => { @@ -35,7 +45,17 @@ module.exports = function (options) { db.Pledge.findByPk(request.params.id, { include: [ { - association: db.Pledge.Entity + association: db.Pledge.Owner, + include: [ + { + association: db.Owner.OwnerEntity, + include: [ + { + association: db.OwnerEntity.Entity + } + ] + } + ] }, { association: db.Pledge.TranslationArtifactVersionPledges, diff --git a/server/views/pledge.pug b/server/views/pledge.pug index 93e130b..9a28dcf 100644 --- a/server/views/pledge.pug +++ b/server/views/pledge.pug @@ -10,7 +10,7 @@ block content h1 #{totalSatoshis} sats Pledge p.flow-text - small #{pledge.entity.name} + small #{pledge.owner.ownerEntity.entity.name} br span= pledge.message diff --git a/server/views/pledges.pug b/server/views/pledges.pug index 36b78a3..2e7667a 100644 --- a/server/views/pledges.pug +++ b/server/views/pledges.pug @@ -14,6 +14,6 @@ block content a(href=`/pledges/${pledge.id}`) #{totalSatoshis} sats for #{pledge.translationArtifactVersionPledges.length} translations br small - small.chip= pledge.entity.name + small.chip= pledge.owner.ownerEntity.entity.name br small= pledge.message \ No newline at end of file