Merge branch 'ConstructionConsent/ordering' into 'master'
fixed ordering See merge request fronk/thetool!1287
This commit is contained in:
@@ -379,10 +379,18 @@ class ConstructionConsent extends mfBaseModel {
|
||||
$order = "vh.strasse, CAST(vh.hausnummer AS UNSIGNED) ASC";
|
||||
}
|
||||
$having = '';
|
||||
if(array_key_exists("status_light", $filter) && strlen(trim($filter['status_light'])) > 2) {
|
||||
$having = " HAVING status_light = '".$filter['status_light']."'";
|
||||
if(array_key_exists("status_light", $filter)) {
|
||||
if (is_array($filter['status_light']) && count($filter['status_light']) > 0) {
|
||||
$statusLights = array_map(function($item) {
|
||||
return "'" . addslashes(trim($item)) . "'";
|
||||
}, $filter['status_light']);
|
||||
$having = " HAVING status_light IN (" . implode(",", $statusLights) . ")";
|
||||
} elseif (strlen(trim($filter['status_light'])) > 2) {
|
||||
$having = " HAVING status_light = '" . addslashes(trim($filter['status_light'])) . "'";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
|
||||
Reference in New Issue
Block a user