Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Use the repository manager.

Browse Source
This commit is contained in:
David Molineus
2017-10-19 08:45:39 +02:00
parent ce9de6ded3
commit ef7b493b2d
13 changed files with 292 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Mapper/UI/MarkerMapper.php
View File

@@ -20,6 +20,7 @@ use Netzmacht\Contao\Leaflet\Mapper\Request;
use Netzmacht\Contao\Leaflet\Model\IconModel;
use Netzmacht\Contao\Leaflet\Model\MarkerModel;
use Netzmacht\Contao\Leaflet\Model\PopupModel;
use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
use Netzmacht\LeafletPHP\Definition;
use Netzmacht\LeafletPHP\Definition\Type\ImageIcon;
use Netzmacht\LeafletPHP\Definition\UI\Marker;
@@ -53,16 +54,25 @@ class MarkerMapper extends AbstractMapper
*/
protected $valueFilter;
/**
* Repository manager.
*
* @var RepositoryManager
*/
private $repositoryManager;
/**
* Construct.
*
* @param ValueFilter $valueFilter Frontend filter.
* @param RepositoryManager $repositoryManager Repository manager.
* @param ValueFilter $valueFilter Frontend filter.
*/
public function __construct(ValueFilter $valueFilter)
public function __construct(RepositoryManager $repositoryManager, ValueFilter $valueFilter)
{
parent::__construct();
$this->repositoryManager = $repositoryManager;
$this->valueFilter = $valueFilter;
$this->valueFilter = $valueFilter;
parent::__construct();
}
/**
@@ -108,7 +118,8 @@ class MarkerMapper extends AbstractMapper
$content = $this->valueFilter->filter($model->popupContent);
if ($model->popup) {
$popupModel = PopupModel::findActiveByPK($model->popup);
$popupRepository = $this->repositoryManager->getRepository(PopupModel::class);
$popupModel = $popupRepository->findActiveByPK($model->popup);
if ($popupModel) {
$popup = $mapper->handle($popupModel, $request, null, $definition);
@@ -123,7 +134,8 @@ class MarkerMapper extends AbstractMapper
}
if ($model->customIcon) {
$iconModel = IconModel::findBy(
$iconRepository = $this->repositoryManager->getRepository(IconModel::class);
$iconModel = $iconRepository->findBy(
['id=?', 'active=1'],
[$model->icon],
['return' => 'Model']