blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 02:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- FiltersLib bugfix: now method generateDatasetQuery always build a query with no filters (no where clause) if the filters array is empty

Browse Source 
- Added comments to Filters_model methods
- Removed method deleteCustomFilter from Filters_model
- Method getFilterList changed to load all the filters, removed default_filter = false from the where clause
This commit is contained in:
Paolo
2018-06-13 16:50:39 +02:00
parent 34296a436e
commit 2cbda912e3
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/FiltersLib.php
+2 -2
View File
@@ -264,7 +264,7 @@ class FiltersLib
*/ */
public function generateDatasetQuery($query, $filters) public function generateDatasetQuery($query, $filters)
{ {
$datasetQuery = null; $datasetQuery = 'SELECT * FROM ('.$query.') '.self::DATASET_TABLE_ALIAS;
// If the given query is valid and the parameter filters is an array // If the given query is valid and the parameter filters is an array
if (!empty(trim($query)) && $filters != null && is_array($filters)) if (!empty(trim($query)) && $filters != null && is_array($filters))
@@ -287,7 +287,7 @@ class FiltersLib
if ($where != '') // if the SQL where clause was built if ($where != '') // if the SQL where clause was built
{ {
$datasetQuery = 'SELECT * FROM ('.$query.') '.self::DATASET_TABLE_ALIAS.' WHERE '.$where; $datasetQuery .= ' WHERE '.$where;
} }
} }
application/models/system/Filters_model.php
+2 -11
View File
@@ -13,7 +13,7 @@ class Filters_model extends DB_Model
} }
/** /**
* * Loads a filter by its app, dataset_name and filter_kurzbz
*/ */
public function getFilterList($app, $dataset_name, $filter_kurzbz) public function getFilterList($app, $dataset_name, $filter_kurzbz)
{ {
@@ -24,7 +24,6 @@ class Filters_model extends DB_Model
'app' => $app, 'app' => $app,
'dataset_name' => $dataset_name, 'dataset_name' => $dataset_name,
'person_id' => null, 'person_id' => null,
'default_filter' => false,
'array_length(description, 1) >' => 0, 'array_length(description, 1) >' => 0,
'filter_kurzbz ILIKE' => $filter_kurzbz 'filter_kurzbz ILIKE' => $filter_kurzbz
); );
@@ -33,7 +32,7 @@ class Filters_model extends DB_Model
} }
/** /**
* * Loads a custom filter by its app, dataset_name and the uid of the owner
*/ */
public function getCustomFiltersList($app, $dataset_name, $uid) public function getCustomFiltersList($app, $dataset_name, $uid)
{ {
@@ -50,12 +49,4 @@ class Filters_model extends DB_Model
return $this->loadWhere($filterParametersArray); return $this->loadWhere($filterParametersArray);
} }
/**
*
*/
public function deleteCustomFilter($filter_id)
{
return $this->delete($filter_id);
}
} }