Upgrade to 3.3.3

This commit is contained in:
Bastian Allgeier
2020-01-20 12:19:33 +01:00
parent dd8a5e1ac3
commit 9c87f2fbc3
40 changed files with 1630 additions and 189 deletions

View File

@@ -67,7 +67,7 @@ return [
'methods' => [
'toDate' => function ($value) {
if ($timestamp = timestamp($value, $this->time['step'] ?? 5)) {
return date(DATE_W3C, $timestamp);
return date('Y-m-d H:i:s', $timestamp);
}
return null;

View File

@@ -89,7 +89,12 @@ return [
[
'pattern' => 'files',
'action' => function () {
return $this->field()->filepicker($this->field()->files());
$params = array_merge($this->field()->files(), [
'page' => $this->requestQuery('page'),
'search' => $this->requestQuery('search')
]);
return $this->field()->filepicker($params);
}
],
[

View File

@@ -7,6 +7,7 @@ return function (array $props) {
'type' => 'files',
'layout' => $props['layout'] ?? 'cards',
'template' => $props['template'] ?? null,
'image' => $props['image'] ?? null,
'info' => '{{ file.dimensions }}'
]
];
@@ -15,7 +16,8 @@ return function (array $props) {
unset(
$props['headline'],
$props['layout'],
$props['template']
$props['template'],
$props['image']
);
return $props;

View File

@@ -5,8 +5,6 @@ use Kirby\Cms\Media;
use Kirby\Cms\Panel;
use Kirby\Cms\PanelPlugins;
use Kirby\Cms\PluginAssets;
use Kirby\Http\Response\Redirect;
use Kirby\Http\Router\Route;
use Kirby\Toolkit\Str;
return function ($kirby) {

View File

@@ -114,14 +114,16 @@ return [
$data[] = [
'dragText' => $file->dragText('auto', $dragTextAbsolute),
'extension' => $file->extension(),
'filename' => $file->filename(),
'id' => $file->id(),
'text' => $file->toString($this->text),
'info' => $file->toString($this->info ?? false),
'icon' => $file->panelIcon($image),
'image' => $image,
'info' => $file->toString($this->info ?? false),
'link' => $file->panelUrl(true),
'mime' => $file->mime(),
'parent' => $file->parent()->panelPath(),
'text' => $file->toString($this->text),
'url' => $file->url(),
];
}