Skip to content

4.1.1 Change: SUB COLLECTION, show if nested and set icon #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 3.x
Choose a base branch
from
Open

4.1.1 Change: SUB COLLECTION, show if nested and set icon #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdefeac
Update GetList.php
SilverMabol Jan 30, 2025
e311644
Update GetList.php
SilverMabol Jan 30, 2025
88dddb2
Update default.inc.php
SilverMabol Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/components/collections/lexicon/en/default.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
$_lang['setting_collections.tree_tbar_collection_desc'] = 'Show "New Collection" button in Tree tool bar';
$_lang['setting_collections.tree_tbar_selection'] = 'Tree Tool Bar - Selection';
$_lang['setting_collections.tree_tbar_selection_desc'] = 'Show "New Selection" button in Tree tool bar';
$_lang['setting_collections.mostra_sub_collections'] = 'Show Nested Collection/Selection';
$_lang['setting_collections.mostra_sub_collections_desc'] = 'Decidi if you wanto, or not, show nested Collection/Selection in grid';


// System lexicons
Expand Down
18 changes: 14 additions & 4 deletions core/components/collections/src/Processors/Resource/GetList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,13 @@ public function prepareQueryBeforeCount(xPDOQuery $c)
break;
}

$c->where([
'class_key:!=' => CollectionContainer::class,
// "NOT EXISTS (SELECT 1 FROM {$this->modx->getTableName('modResource')} r WHERE r.parent = modResource.id)"
]);

if (!$this->modx->getOption('mostra_sub_collections', null, false)) {
$c->where([
'class_key:!=' => CollectionContainer::class,
// "NOT EXISTS (SELECT 1 FROM {$this->modx->getTableName('modResource')} r WHERE r.parent = modResource.id)"
]);
}

foreach ($this->tvColumns as $column) {
$c->leftJoin(modTemplateVarResource::class, '`TemplateVarResources_' . $column['column'] . '`', '`TemplateVarResources_' . $column['column'] . '`.`contentid` = modResource.id AND `TemplateVarResources_' . $column['column'] . '`.`tmplvarid` = ' . $column['id']);
Expand Down Expand Up @@ -681,6 +684,13 @@ public function prepareIcons($resourceArray)
$iconCls[] = 'parent-resource';
}

if ($resourceArray['class_key'] == 'Collections\Model\SelectionContainer' ) {
$iconCls[] = 'selectioncontainer';
}
if ($resourceArray['class_key'] == 'Collections\Model\CollectionContainer' ) {
$iconCls[] = 'collectioncontainer';
}

$resourceArray['icons'] = implode(' ', $iconCls);

return $resourceArray;
Expand Down