Skip to content

Commit

Permalink
Merge pull request #4 from contao-estatemanager/develop
Browse files Browse the repository at this point in the history
Published status considered on calling records by RealEstateModel
  • Loading branch information
eki89 authored Jul 16, 2020
2 parents 8949e65 + 44d9624 commit e246bfd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/Resources/contao/classes/Project.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static function getProjectMarketingStatus($objMaster): int

$arrValues = array($objMaster->master);

$objChildren = RealEstateModel::findBy($arrColumns, $arrValues, array());
$objChildren = RealEstateModel::findPublishedBy($arrColumns, $arrValues, array());

if($objChildren === null)
{
Expand Down Expand Up @@ -266,7 +266,7 @@ public static function getNumberOfChildren($realEstate): int

$arrValues = array($masterId);

return RealEstateModel::countBy($arrColumns, $arrValues, array());
return RealEstateModel::countPublishedBy($arrColumns, $arrValues, array());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ protected function compile()
$arrColumns[] = "$this->strTable.master=''";
$arrValues[] = $this->realEstate->master;

$objChildren = RealEstateModel::findBy($arrColumns, $arrValues, $arrOptions);
$objChildren = RealEstateModel::findPublishedBy($arrColumns, $arrValues, $arrOptions);

if($objChildren !== null)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Resources/contao/modules/ModuleRealEstateProjectList.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ protected function compile()

list($arrColumns, $arrValues, $arrOptions) = $this->getProjectParameters();

$cntProjects = RealEstateModel::countBy($arrColumns, $arrValues, $arrOptions);
$cntProjects = RealEstateModel::countPublishedBy($arrColumns, $arrValues, $arrOptions);

list($limit, $offset) = $this->addPagination($cntProjects);

$arrOptions['limit'] = $limit;
$arrOptions['offset'] = $offset;

$objProjects = RealEstateModel::findBy($arrColumns, $arrValues, $arrOptions);
$objProjects = RealEstateModel::findPublishedBy($arrColumns, $arrValues, $arrOptions);
$projectIds = array();
$arrProjects = array();
$arrRealEstates = array();
Expand All @@ -133,7 +133,7 @@ protected function compile()
$arrColumns[] = "$this->strTable.gruppenKennung IN(" . implode(",", $projectIds) . ")";
$arrColumns[] = "$this->strTable.master=''";

$objChildren = RealEstateModel::findBy($arrColumns, $arrValues, $arrOptions);
$objChildren = RealEstateModel::findPublishedBy($arrColumns, $arrValues, $arrOptions);

// get real number of all children if needed (without filter parameters)
if(!!$this->childrenObserveFiltering)
Expand Down

0 comments on commit e246bfd

Please sign in to comment.