@@ -53,8 +53,13 @@

                                         <ul>

                                             <li>

                                                 <span class="label">Adresse:</span>

-                                                {% if item.address is not empty %}{{ item.address }}<br>{% endif %}

-                                                {% if item.postal is not empty and item.city is not empty %}{{ item.postal }} {{ item.city }}<br>{% endif %}

+                                                {% if item.hasProperty %}

+                                                    {% if item.property.address is not empty %}{{ item.property.address }}<br>{% endif %}

+                                                    {% if item.property.postal is not empty and item.property.city is not empty %}{{ item.property.postal }} {{ item.property.city }}<br>{% endif %}

+                                                {% else %}

+                                                    {% if item.address is not empty %}{{ item.address }}<br>{% endif %}

+                                                    {% if item.postal is not empty and item.city is not empty %}{{ item.postal }} {{ item.city }}<br>{% endif %}

+                                                {% endif %}

                                             </li>

                                             {% if item.livingSpace > 0 %}

                                                 <li>

@@ -90,9 +90,19 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController

         {

             $arrItem = array_merge($asset->row(), [

                 'teaserFigure' => $this->getImageFigures($asset->gallerySRC, $figureBuilder, $asset->orderSRC, 1),

-                'detailsUrl'   => $jumpTo !== null ? $urlGenerator->generate($jumpTo, ['parameters'=>'/items/'.$asset->id]) : null

+                'detailsUrl'   => $jumpTo !== null ? $urlGenerator->generate($jumpTo, ['parameters'=>'/items/'.$asset->id]) : null,

+                'hasProperty' => false

             ]);

+            // Check for object

+            if (($Property = $asset->getRelated('managedPropertyId')) !== null) {

+                $arrItem['hasProperty'] = true;

+                $arrItem['property'] = array_merge($Property->row(),[

+                    'teaserFigure'      => $this->getImageFigures($Property->gallerySRC, $figureBuilder, $Property->orderSRC, 1),

+                    'galleryFigures'    => $this->getImageFigures($Property->gallerySRC, $figureBuilder, $Property->orderSRC, 0, 0),

+                ]);

+            }

+

             // Grouping

             if ($model->vr_re_grouped)

             {

@@ -126,11 +136,18 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController

             }

             if (!empty($asset->city))

             {

+                $strCity = $asset->city;

+

+                // Check for object

+                if (($Property = $asset->getRelated('managedPropertyId')) !== null) {

+                    $strCity = $Property->city;

+                }

+

                 $tmpOptions = $arrAssetsOptions;

-                $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['city'=>'city = ?']);

-                $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),['city'=>$asset->city]);

+                $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['city'=>'(city = ? AND managedPropertyId < 1) OR ? IN (SELECT p.city FROM tl_vr_re_managedProperties p WHERE p.id = managedPropertyId)']);

+                $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),[$strCity,$strCity]);

                 $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);

-                $arrFilterOptions['city'][$asset->city] = $asset->city . ' ('.$count.')';

+                $arrFilterOptions['city'][$strCity] = $strCity . ' ('.$count.')';

             }

             if (!empty($asset->coldRent))

             {