... |
... |
@@ -69,7 +69,7 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
|
69 |
69 |
} else {
|
70 |
70 |
if ($filter == 'city')
|
71 |
71 |
{
|
72 |
|
- $arrAssetsOptions['column'][$filter] = "($filter = ? AND managedPropertyId < 1) OR ? IN (SELECT p.city FROM tl_vr_re_managedProperties p WHERE p.id = managedPropertyId)";
|
|
72 |
+ $arrAssetsOptions['column'][$filter] = "(($filter = ? AND managedPropertyId < 1) OR ? IN (SELECT p.city FROM tl_vr_re_managedProperties p WHERE p.id = managedPropertyId))";
|
73 |
73 |
$arrAssetsOptions['value'][$filter.'_sq'] = $rawValue;
|
74 |
74 |
} else
|
75 |
75 |
{
|
... |
... |
@@ -157,7 +157,7 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
|
157 |
157 |
}
|
158 |
158 |
|
159 |
159 |
$tmpOptions = $arrAssetsOptions;
|
160 |
|
- $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)']);
|
|
160 |
+ $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))']);
|
161 |
161 |
$tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),['city'=>$strCity,'city_sq'=>$strCity]);
|
162 |
162 |
$count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);
|
163 |
163 |
if ($count > 0)
|