interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.7.3

Browse Source
This commit is contained in:
Bastian Allgeier
2022-08-10 12:18:04 +02:00
parent fbb8023da4
commit 281090cd87
9 changed files with 125 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kirby/config/sections/mixins/layout.php
View File

@@ -96,10 +96,18 @@ return [
'methods' => [
'columnsValues' => function (array $item, $model) {
$item['title'] = [
'text' => $item['text'],
// override toSafeString() coming from `$item`
// because the table cells don't use v-html
'text' => $model->toString($this->text),
'href' => $model->panel()->url(true)
];
if ($this->info) {
// override toSafeString() coming from `$item`
// because the table cells don't use v-html
$item['info'] = $model->toString($this->info);
}
foreach ($this->columns as $columnName => $column) {
// don't overwrite essential columns
if (isset($item[$columnName]) === true) {
@@ -107,11 +115,7 @@ return [
}
if (empty($column['value']) === false) {
if ($column['type'] ?? false === 'html') {
$value = $model->toString($column['value']);
} else {
$value = $model->toSafeString($column['value']);
}
$value = $model->toString($column['value']);
} else {
$value = $model->content()->get($column['id'] ?? $columnName)->value();
}