From 75b78d3c991630308269fdb4e8133c1fdbaa4164 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 28 Nov 2023 17:27:26 +0100 Subject: [PATCH 1/2] add paginator to budget admin pages --- .../ChillBudgetBundle/Controller/Admin/ChargeKindController.php | 2 +- .../Controller/Admin/ResourceKindController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php b/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php index 642b7cc61..a84d54e40 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php @@ -23,6 +23,6 @@ class ChargeKindController extends CRUDController /* @var QueryBuilder $query */ $query->addOrderBy('e.ordering', 'ASC'); - return $query; + return parent::orderQuery($action, $query, $request, $paginator); } } diff --git a/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php b/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php index 0762f8252..ffef467f9 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php @@ -23,6 +23,6 @@ class ResourceKindController extends CRUDController /* @var QueryBuilder $query */ $query->addOrderBy('e.ordering', 'ASC'); - return $query; + return parent::orderQuery($action, $query, $request, $paginator); } } From eef93b8a0d8c17a6525eeacc7c644d4e9b7c0186 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 29 Nov 2023 11:33:26 +0100 Subject: [PATCH 2/2] add changie --- .changes/unreleased/UX-20231129-113317.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changes/unreleased/UX-20231129-113317.yaml diff --git a/.changes/unreleased/UX-20231129-113317.yaml b/.changes/unreleased/UX-20231129-113317.yaml new file mode 100644 index 000000000..95e798080 --- /dev/null +++ b/.changes/unreleased/UX-20231129-113317.yaml @@ -0,0 +1,5 @@ +kind: UX +body: Add a paginator to budget elements (resource and charge types) in the admin +time: 2023-11-29T11:33:17.144530042+01:00 +custom: + Issue: "100"