From 7d0307fc9c93cdc8f49bb2e9d88a23b16f5186f7 Mon Sep 17 00:00:00 2001 From: matdave Date: Fri, 5 May 2023 15:11:06 -0500 Subject: [PATCH 1/3] adding pbowyer change #363 --- core/components/collections/src/Processors/Resource/GetList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/components/collections/src/Processors/Resource/GetList.php b/core/components/collections/src/Processors/Resource/GetList.php index 61582c5..c181f3f 100644 --- a/core/components/collections/src/Processors/Resource/GetList.php +++ b/core/components/collections/src/Processors/Resource/GetList.php @@ -380,7 +380,7 @@ public function prepareQueryBeforeCount(xPDOQuery $c) public function prepareQueryAfterCount(xPDOQuery $c) { - $c->select($this->modx->getSelectColumns(modResource::class, 'modResource')); + $c->select('DISTINCT ' . $this->modx->getSelectColumns(modResource::class, 'modResource')); $c->select([ 'has_children' => "EXISTS (SELECT 1 FROM {$this->modx->getTableName(modResource::class)} r WHERE r.parent = modResource.id)" ]); From 7f0db42884c9d5b973fc41895731a6a64703a067 Mon Sep 17 00:00:00 2001 From: matdave Date: Fri, 5 May 2023 15:24:18 -0500 Subject: [PATCH 2/3] bump version --- _build/gpm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_build/gpm.json b/_build/gpm.json index aa07ffb..7614272 100644 --- a/_build/gpm.json +++ b/_build/gpm.json @@ -4,7 +4,7 @@ "namespace": "Collections", "description": "Hides resources under this container in tree. Adding grid int o the update resource panel.", "author": "John Peca", - "version": "4.0.0-beta1", + "version": "4.0.0-pl", "menus": [ { "text": "collections.menu.collection_templates", From 7d00cde68445aa06e64236d0e9af16e020457809 Mon Sep 17 00:00:00 2001 From: matdave Date: Fri, 5 May 2023 15:29:54 -0500 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f055d82..d60bcb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Changelog for Collections. Collections 4.0.0 =================== - Support for MODX Revolution 3.0.0 +- Fix Fred endpoints +- Fix quick update action +- Fix view for Create New +- Fetch distinct resources for collection Collections 3.7.1 ===================