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

refactor content loop splitting parseResults method

Browse Source
This commit is contained in:
Manuel Raynaud
2014-04-30 10:57:04 +02:00
parent 0b36b2222d
commit 67293555ba
1 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,7 +205,7 @@ class Content extends BaseI18nLoop implements PropelSearchLoopInterface
/** @var \Thelia\Model\Content $content */ /** @var \Thelia\Model\Content $content */
foreach ($loopResult->getResultDataCollection() as $content) { foreach ($loopResult->getResultDataCollection() as $content) {
$loopResultRow = new LoopResultRow($content); $loopResultRow = new LoopResultRow($content);
$defaultFolderId = $content->getDefaultFolderId();
$loopResultRow->set("ID" , $content->getId()) $loopResultRow->set("ID" , $content->getId())
->set("IS_TRANSLATED" , $content->getVirtualColumn('IS_TRANSLATED')) ->set("IS_TRANSLATED" , $content->getVirtualColumn('IS_TRANSLATED'))
->set("LOCALE" , $this->locale) ->set("LOCALE" , $this->locale)
@@ -218,44 +218,57 @@ class Content extends BaseI18nLoop implements PropelSearchLoopInterface
->set("META_DESCRIPTION" , $content->getVirtualColumn('i18n_META_DESCRIPTION')) ->set("META_DESCRIPTION" , $content->getVirtualColumn('i18n_META_DESCRIPTION'))
->set("META_KEYWORDS" , $content->getVirtualColumn('i18n_META_KEYWORDS')) ->set("META_KEYWORDS" , $content->getVirtualColumn('i18n_META_KEYWORDS'))
->set("POSITION" , $content->getPosition()) ->set("POSITION" , $content->getPosition())
->set("DEFAULT_FOLDER" , $content->getDefaultFolderId()) ->set("DEFAULT_FOLDER" , $defaultFolderId)
->set("VISIBLE" , $content->getVisible()) ->set("VISIBLE" , $content->getVisible())
; ;
if ($this->getBackend_context() || $this->getWithPrevNextInfo()) {
$defaultFolderId = $content->getDefaultFolderId();
// Find previous and next category
$previous = ContentQuery::create()
->joinContentFolder()
->where('ContentFolder.folder_id = ?', $defaultFolderId)
->filterByPosition($content->getPosition(), Criteria::LESS_THAN)
->orderByPosition(Criteria::DESC)
->findOne()
;
$next = ContentQuery::create()
->joinContentFolder()
->where('ContentFolder.folder_id = ?', $defaultFolderId)
->filterByPosition($content->getPosition(), Criteria::GREATER_THAN)
->orderByPosition(Criteria::ASC)
->findOne()
;
$loopResultRow $loopResult->addRow($this->findNextPrev($loopResultRow, $content, $defaultFolderId));
->set("HAS_PREVIOUS" , $previous != null ? 1 : 0)
->set("HAS_NEXT" , $next != null ? 1 : 0)
->set("PREVIOUS" , $previous != null ? $previous->getId() : -1)
->set("NEXT" , $next != null ? $next->getId() : -1)
;
}
$loopResult->addRow($loopResultRow);
} }
return $loopResult; return $loopResult;
} }
/**
* @param LoopResultRow $loopResultRow
* @param \Thelia\Model\Content $content
* @param $defaultFolderId
* @return LoopResultRow
*/
private function findNextPrev(LoopResultRow $loopResultRow, \Thelia\Model\Content $content, $defaultFolderId)
{
if ($this->getBackend_context() || $this->getWithPrevNextInfo()) {
// Find previous and next category
$previous = ContentQuery::create()
->joinContentFolder()
->where('ContentFolder.folder_id = ?', $defaultFolderId)
->filterByPosition($content->getPosition(), Criteria::LESS_THAN)
->orderByPosition(Criteria::DESC)
->findOne()
;
$next = ContentQuery::create()
->joinContentFolder()
->where('ContentFolder.folder_id = ?', $defaultFolderId)
->filterByPosition($content->getPosition(), Criteria::GREATER_THAN)
->orderByPosition(Criteria::ASC)
->findOne()
;
$loopResultRow
->set("HAS_PREVIOUS" , $previous != null ? 1 : 0)
->set("HAS_NEXT" , $next != null ? 1 : 0)
->set("PREVIOUS" , $previous != null ? $previous->getId() : -1)
->set("NEXT" , $next != null ? $next->getId() : -1)
;
}
return $loopResultRow;
}
} }