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

Merge branch 'master' into permissions

Browse Source
This commit is contained in:
Paolo
2018-06-15 11:13:16 +02:00
parent 249f273091 264ec9be9e
commit 0dde3095b2
28 changed files with 2619 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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)
{
@@ -24,7 +24,6 @@ class Filters_model extends DB_Model
'app' => $app,
'dataset_name' => $dataset_name,
'person_id' => null,
'default_filter' => false,
'array_length(description, 1) >' => 0,
'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)
{
@@ -50,12 +49,4 @@ class Filters_model extends DB_Model
return $this->loadWhere($filterParametersArray);
}
/**
*
*/
public function deleteCustomFilter($filter_id)
{
return $this->delete($filter_id);
}
}