Browse code

Fix city filter regarding managedProperty linked assets

Benjamin Roth authored on30/09/2024 16:48:01
Showing1 changed files
... ...
@@ -70,13 +70,12 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
70 70
                         if ($filter == 'city')
71 71
                         {
72 72
                             $arrAssetsOptions['column'][$filter] = "($filter = ? AND managedPropertyId < 1) OR ? IN (SELECT p.city FROM tl_vr_re_managedProperties p WHERE p.id = managedPropertyId)";
73
-                            $arrAssetsOptions['value'][$filter] = $rawValue;
74 73
                             $arrAssetsOptions['value'][$filter.'_sq'] = $rawValue;
75 74
                         } else
76 75
                         {
77 76
                             $arrAssetsOptions['column'][$filter] = "$filter = ?";
78
-                            $arrAssetsOptions['value'][$filter] = $rawValue;
79 77
                         }
78
+                        $arrAssetsOptions['value'][$filter] = $rawValue;
80 79
                     }
81 80
                 }
82 81
             }
... ...
@@ -159,7 +158,7 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
159 158
 
160 159
                 $tmpOptions = $arrAssetsOptions;
161 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)']);
162
-                $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),['city'=>$strCity,$strCity]);
161
+                $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),['city'=>$strCity,'city_sq'=>$strCity]);
163 162
                 $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);
164 163
                 if ($count > 0)
165 164
                 {