Skip to content

Commit 220529f

Browse files
Mh-Asmituxpiper
authored andcommitted
change category limit
1 parent b9ad839 commit 220529f

File tree

3 files changed

+26
-9
lines changed

3 files changed

+26
-9
lines changed

src/Ushahidi/Modules/V5/Actions/Category/Queries/FetchAllCategoriesQuery.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class FetchAllCategoriesQuery implements Query
2121
public static function fromRequest(Request $request): self
2222
{
2323
$query = new self();
24+
$query->setDefaultLimit(1000);
2425
$query->setPaging($request);
2526
$query->setSearchFields(new CategorySearchFields($request));
2627
$query->addOnlyParameteresFromRequest(

src/Ushahidi/Modules/V5/Http/Resources/CategoryResource.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ public function toArray($request)
5454
'available' => $this->translations->groupBy('language')->keys()
5555
];
5656
}
57-
$data['allowed_privileges']= $this->getResourcePrivileges();
57+
// To Do: this call cause an infinit loop , need to be checked
58+
// note: it was not found before last commit , so it will not disable it it will not affect the work of front end
59+
//$data['allowed_privileges']= $this->getResourcePrivileges();
5860
return $data;
5961
}
6062

src/Ushahidi/Modules/V5/Traits/HasPaginate.php

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ trait HasPaginate
1313
private $paging;
1414
private $default_order;
1515
private $default_sort_by = 'id';
16-
private $default_limit = '20';
16+
private $default_limit = 20;
17+
private $default_page = 1;
1718

1819
public function getPaging(): Paging
1920
{
2021
return $this->paging;
2122
}
22-
23+
2324
public function setPaging(
2425
Request $request,
2526
$default_sort_by = null,
@@ -29,15 +30,28 @@ public function setPaging(
2930
) {
3031
$this->paging = Paging::fromRequest(
3132
$request,
32-
$default_sort_by,
33-
$default_order,
34-
$default_limit,
35-
$default_page
33+
$default_sort_by ?? $this->default_sort_by,
34+
$default_order ?? $this->default_order,
35+
$default_limit ?? $this->default_limit,
36+
$default_page ?? $this->default_page
3637
);
3738
}
3839

39-
public function setDefaultOrder(): void
40+
public function setDefaultOrder($order): void
41+
{
42+
$this->default_order = $order;
43+
}
44+
public function setDefaultSort($sort): void
45+
{
46+
$this->default_sort_by = $sort;
47+
}
48+
public function setDefaultLimit($limit): void
49+
{
50+
$this->default_limit = $limit;
51+
}
52+
53+
public function setDefaultPage($page): void
4054
{
41-
$this->paging;
55+
$this->page = $page;
4256
}
4357
}

0 commit comments

Comments
 (0)