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

Upgrade to 3.8.4

Browse Source
This commit is contained in:
Bastian Allgeier
2023-01-10 09:58:43 +01:00
parent 7f6e78ab3b
commit 0ebe0c7b16
35 changed files with 145 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kirby/src/Panel/Document.php
View File

@@ -198,7 +198,9 @@ class Document
*/
public static function icons(): string
{
return F::read(App::instance()->root('kirby') . '/panel/dist/img/icons.svg');
$dev = App::instance()->option('panel.dev', false);
$dir = $dev ? 'public' : 'dist';
return F::read(App::instance()->root('kirby') . '/panel/' . $dir . '/img/icons.svg');
}
/**

7
kirby/src/Panel/File.php
View File

@@ -292,17 +292,22 @@ class File extends Model
public function pickerData(array $params = []): array
{
$name = $this->model->filename();
$id = $this->model->id();
if (empty($params['model']) === false) {
$parent = $this->model->parent();
// if the file belongs to the current parent model,
// store only name as ID to keep its path relative to the model
$id = $parent === $params['model'] ? $name : $id;
$absolute = $parent !== $params['model'];
}
$params['text'] ??= '{{ file.filename }}';
return array_merge(parent::pickerData($params), [
'filename' => $name,
'dragText' => $this->dragText('auto', $absolute ?? false),
'filename' => $name,
'id' => $id,
'type' => $this->model->type(),
'url' => $this->model->url()
]);