From 94ffd1748b3f17bb140c08e94483b8bb780764b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= Date: Mon, 3 Jun 2024 16:20:05 +0200 Subject: [PATCH] Add record prop to block base --- .../src/components/PageBlocks/Wrap/base.vue | 18 ++++++++++++------ .../compose/src/components/PageBlocks/base.vue | 6 ------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/web/compose/src/components/PageBlocks/Wrap/base.vue b/client/web/compose/src/components/PageBlocks/Wrap/base.vue index f56d23805..32957f072 100644 --- a/client/web/compose/src/components/PageBlocks/Wrap/base.vue +++ b/client/web/compose/src/components/PageBlocks/Wrap/base.vue @@ -13,6 +13,12 @@ export default { required: true, }, + record: { + type: compose.Record, + required: false, + default: undefined, + }, + scrollableBody: { type: Boolean, required: false, @@ -89,20 +95,20 @@ export default { blockTitle () { return evaluatePrefilter(this.block.title, { - record: this.$attrs.record, + record: this.record, user: this.$auth.user || {}, - recordID: (this.$attrs.record || {}).recordID || NoID, - ownerID: (this.$attrs.record || {}).ownedBy || NoID, + recordID: (this.record || {}).recordID || NoID, + ownerID: (this.record || {}).ownedBy || NoID, userID: (this.$auth.user || {}).userID || NoID, }) }, blockDescription () { return evaluatePrefilter(this.block.description, { - record: this.$attrs.record, + record: this.record, user: this.$auth.user || {}, - recordID: (this.$attrs.record || {}).recordID || NoID, - ownerID: (this.$attrs.record || {}).ownedBy || NoID, + recordID: (this.record || {}).recordID || NoID, + ownerID: (this.record || {}).ownedBy || NoID, userID: (this.$auth.user || {}).userID || NoID, }) }, diff --git a/client/web/compose/src/components/PageBlocks/base.vue b/client/web/compose/src/components/PageBlocks/base.vue index 3e92338d6..31b0178ca 100644 --- a/client/web/compose/src/components/PageBlocks/base.vue +++ b/client/web/compose/src/components/PageBlocks/base.vue @@ -77,12 +77,6 @@ export default { type: Set, default: () => new Set(), }, - - headerClass: { - type: String, - required: false, - default: '', - }, }, data () {