Upgrade to 3.0.3

This commit is contained in:
Bastian Allgeier
2019-03-05 10:55:03 +01:00
parent 8e3d86a590
commit 418db4b09b
40 changed files with 704 additions and 144 deletions

View File

@@ -22,6 +22,12 @@ return [
// be lowercase as well.
return array_change_key_case($columns);
},
/**
* The placeholder text if no items have been added yet
*/
'empty' => function ($empty = null) {
return I18n::translate($empty, $empty);
},
/**
* Fields setup for the structure form. Works just like fields in regular forms.
*/

View File

@@ -27,6 +27,12 @@ return [
return $this->toUsers($default);
},
/**
* The placeholder text if no users have been selected yet
*/
'empty' => function ($empty = null) {
return I18n::translate($empty, $empty);
},
/**
* The minimum number of required selected users
*/

View File

@@ -148,7 +148,12 @@ return function ($kirby) {
'method' => 'ALL',
'env' => 'site',
'action' => function (string $path) use ($kirby) {
if ($page = $kirby->page($path)) {
// check for content representations or files
$extension = F::extension($path);
// try to redirect prefixed pages
if (empty($extension) === true && $page = $kirby->page($path)) {
$url = $kirby->request()->url([
'query' => null,
'params' => null,
@@ -160,9 +165,9 @@ return function ($kirby) {
->response()
->redirect($page->url());
}
return $kirby->resolve($path, $kirby->defaultLanguage()->code());
}
return $kirby->resolve($path, $kirby->defaultLanguage()->code());
}
];
} else {

View File

@@ -109,11 +109,15 @@ return [
];
}
// the drag text needs to be absolute when the files come from
// a different parent model
$dragTextAbsolute = $this->model->is($this->parent) === false;
foreach ($this->files as $file) {
$image = $file->panelImage($this->image, $thumb);
$data[] = [
'dragText' => $file->dragText($this->dragTextType),
'dragText' => $file->dragText($this->dragTextType, $dragTextAbsolute),
'filename' => $file->filename(),
'id' => $file->id(),
'text' => $file->toString($this->text),

View File

@@ -5,8 +5,8 @@ return [
/**
* Sets the text for the empty state box
*/
'empty' => function (string $empty = null) {
return I18n::translate($empty);
'empty' => function ($empty = null) {
return I18n::translate($empty, $empty);
}
],
'methods' => [