host/julienmonnerie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Composer packages

Browse source
This commit is contained in:
Paul Nicoué 2023-04-14 16:34:06 +02:00
parent 67c3d8b307
commit 83cb211fe6
219 changed files with 6487 additions and 4444 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kirby/config/sections/files.php
View file

@ -57,6 +57,11 @@ return [
// search
if ($this->search === true && empty($this->searchterm()) === false) {
$files = $files->search($this->searchterm());
// disable flip and sortBy while searching
// to show most relevant results
$this->flip = false;
$this->sortBy = null;
}
// sort
@ -157,10 +162,9 @@ return [
}
// count all uploaded files
$total = count($this->data);
$max = $this->max ? $this->max - $total : null;
$max = $this->max ? $this->max - $this->total : null;
if ($this->max && $total === $this->max - 1) {
if ($this->max && $this->total === $this->max - 1) {
$multiple = false;
} else {
$multiple = true;
@ -174,7 +178,10 @@ return [
'max' => $max,
'api' => $this->parent->apiUrl(true) . '/files',
'attributes' => array_filter([
'sort' => $this->sortable === true ? $total + 1 : null,
// TODO: an edge issue that needs to be solved:
// if multiple users load the same section at the same time
// and upload a file, uploaded files have the same sort number
'sort' => $this->sortable === true ? $this->total + 1 : null,
'template' => $template
])
];