TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working : Content loop : add default content parameter

Browse Source
This commit is contained in:
gmorel
2013-09-17 14:56:17 +02:00
parent 63b3e0c3da
commit fd1aaaef63
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/lib/Thelia/Core/Template/Loop/Content.php
View File

@@ -61,6 +61,7 @@ class Content extends BaseI18nLoop
return new ArgumentCollection( return new ArgumentCollection(
Argument::createIntListTypeArgument('id'), Argument::createIntListTypeArgument('id'),
Argument::createIntListTypeArgument('folder'), Argument::createIntListTypeArgument('folder'),
Argument::createIntListTypeArgument('folder_default'),
Argument::createBooleanTypeArgument('current'), Argument::createBooleanTypeArgument('current'),
Argument::createBooleanTypeArgument('current_folder'), Argument::createBooleanTypeArgument('current_folder'),
Argument::createIntTypeArgument('depth', 1), Argument::createIntTypeArgument('depth', 1),
@@ -97,9 +98,18 @@ class Content extends BaseI18nLoop
} }
$folder = $this->getFolder(); $folder = $this->getFolder();
$folderDefault = $this->getFolderDefault();
if (!is_null($folder) || !is_null($folderDefault)) {
if (!is_null($folder)) {
$folders = FolderQuery::create()->filterById($folder, Criteria::IN)->find();
}
if (!is_null($folderDefault)) {
$folders = FolderQuery::create()->filterById($folderDefault, Criteria::IN)->find();
}
if (!is_null($folder)) {
$folders = FolderQuery::create()->filterById($folder, Criteria::IN)->find();
$depth = $this->getDepth(); $depth = $this->getDepth();