maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix pagination back links

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-03-04 12:19:40 +01:00
parent 7b28a33aba
commit 30d64973c3
3 changed files with 145 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
lib/Froxlor/UI/Collection.php
View File

@@ -2,6 +2,8 @@
namespace Froxlor\UI;
use Froxlor\Settings;
/**
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
@@ -19,105 +21,105 @@ namespace Froxlor\UI;
*/
class Collection
{
private string $class;
private array $has = [];
private array $params;
private array $userinfo;
private ?Pagination $pagination;
private string $class;
private array $has = [];
private array $params;
private array $userinfo;
private ?Pagination $pagination;
public function __construct(string $class, array $userInfo, array $params = [])
{
$this->class = $class;
$this->params = $params;
$this->userinfo = $userInfo;
}
public function __construct(string $class, array $userInfo, array $params = [])
{
$this->class = $class;
$this->params = $params;
$this->userinfo = $userInfo;
}
private function getListing($class, $params): array
{
return json_decode($class::getLocal($this->userinfo, $params)->listing(), true);
}
private function getListing($class, $params): array
{
return json_decode($class::getLocal($this->userinfo, $params)->listing(), true);
}
public function count(): int
{
return json_decode($this->class::getLocal($this->userinfo, $this->params)->listingCount(), true)['data'];
}
public function count(): int
{
return json_decode($this->class::getLocal($this->userinfo, $this->params)->listingCount(), true)['data'];
}
public function get(): array
{
$result = $this->getListing($this->class, $this->params);
public function get(): array
{
$result = $this->getListing($this->class, $this->params);
// check if the api result contains any items (not the overall listingCount as we might be in a search-resultset)
if (count($result)) {
foreach ($this->has as $has) {
$attributes = $this->getListing($has['class'], $has['params']);
// check if the api result contains any items (not the overall listingCount as we might be in a search-resultset)
if (count($result)) {
foreach ($this->has as $has) {
$attributes = $this->getListing($has['class'], $has['params']);
foreach ($result['data']['list'] as $key => $item) {
foreach ($attributes['data']['list'] as $list) {
if ($item[$has['parentKey']] == $list[$has['childKey']]) {
$result['data']['list'][$key][$has['column']] = $list;
}
}
}
}
}
foreach ($result['data']['list'] as $key => $item) {
foreach ($attributes['data']['list'] as $list) {
if ($item[$has['parentKey']] == $list[$has['childKey']]) {
$result['data']['list'][$key][$has['column']] = $list;
}
}
}
}
}
// attach pagination if available
if ($this->pagination) {
$result = array_merge($result, $this->pagination->getApiResponseParams());
}
// attach pagination if available
if ($this->pagination) {
$result = array_merge($result, $this->pagination->getApiResponseParams());
}
return $result;
}
return $result;
}
public function getData(): array
{
return $this->get()['data'];
}
public function getData(): array
{
return $this->get()['data'];
}
public function getList(): array
{
return $this->getData()['list'];
}
public function getList(): array
{
return $this->getData()['list'];
}
public function getJson(): string
{
return json_encode($this->get());
}
public function getJson(): string
{
return json_encode($this->get());
}
public function has(string $column, string $class, string $parentKey = 'id', string $childKey = 'id', array $params = []): Collection
{
$this->has[] = [
'column' => $column,
'class' => $class,
'parentKey' => $parentKey,
'childKey' => $childKey,
'params' => $params
];
public function has(string $column, string $class, string $parentKey = 'id', string $childKey = 'id', array $params = []): Collection
{
$this->has[] = [
'column' => $column,
'class' => $class,
'parentKey' => $parentKey,
'childKey' => $childKey,
'params' => $params
];
return $this;
}
return $this;
}
public function addParam(array $keyval): Collection
{
$this->params = array_merge($this->params, $keyval);
public function addParam(array $keyval): Collection
{
$this->params = array_merge($this->params, $keyval);
return $this;
}
return $this;
}
public function withPagination(array $columns): Collection
{
// Get only searchable columns
$sortableColumns = [];
foreach ($columns as $key => $column) {
if (isset($column['sortable']) && $column['sortable']) {
$sortableColumns[$key] = $column;
}
}
public function withPagination(array $columns): Collection
{
// Get only searchable columns
$sortableColumns = [];
foreach ($columns as $key => $column) {
if (isset($column['sortable']) && $column['sortable']) {
$sortableColumns[$key] = $column;
}
}
// Prepare pagination
$this->pagination = new Pagination($this->userinfo, $sortableColumns, $this->count());
$this->params = array_merge($this->params, $this->pagination->getApiCommandParams());
// Prepare pagination
$this->pagination = new Pagination($sortableColumns, $this->count(), (int) Settings::Get('panel.paging'));
$this->params = array_merge($this->params, $this->pagination->getApiCommandParams());
return $this;
}
return $this;
}
}