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

FilterWidget bugfixes

Browse Source
This commit is contained in:
Paolo
2018-02-27 18:57:41 +01:00
parent 7869113396
commit f9e3aeb021
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Filters.php
+16 -3
View File
@@ -76,7 +76,12 @@ class Filters extends VileSci_Controller
if ($pos !== false)
{
$json->selectedFiltersAliases[] = $json->allColumnsAliases[$pos];
$json->selectedFiltersAliases[] = $json->selectedFilters[$i];
if ($json->allColumnsAliases != null && is_array($json->allColumnsAliases))
{
$json->selectedFiltersAliases[] = $json->allColumnsAliases[$pos];
}
$json->selectedFiltersMetaData[] = $metaData[$pos];
if (isset($activeFilters[$json->selectedFilters[$i]]))
@@ -233,7 +238,11 @@ class Filters extends VileSci_Controller
if (($pos = array_search($fieldName, $selectedFields)) !== false)
{
array_splice($selectedFields, $pos, 1);
array_splice($columnsAliases, $pos, 1);
if ($columnsAliases != null && is_array($columnsAliases))
{
array_splice($columnsAliases, $pos, 1);
}
}
$_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFields;
@@ -301,7 +310,11 @@ class Filters extends VileSci_Controller
&& array_search($fieldName, $selectedFields) === false)
{
array_push($selectedFields, $fieldName);
array_push($columnsAliases, $allColumnsAliases[$pos]);
if ($columnsAliases != null && is_array($columnsAliases))
{
array_push($columnsAliases, $allColumnsAliases[$pos]);
}
}
$_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFields;