blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 09:04:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

- FilterWidget: bugfixes

Browse Source 
- Added column StgAbgeschickt to formatRaw in system/infocenter/infocenterData.php
This commit is contained in:
Paolo
2018-02-27 18:48:21 +01:00
parent bf46abdcc0
commit 7869113396
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenterData.php
+5
View File
@@ -145,6 +145,11 @@
$datasetRaw->{'LockDate'} = 'Not locked';
}
if ($datasetRaw->{'StgAbgeschickt'} == null)
{
$datasetRaw->{'StgAbgeschickt'} = 'N/A';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {
application/views/widgets/filter/selectFields.php
+6 -1
View File
@@ -151,7 +151,12 @@
for (var i = 0; i < data.allSelectedFields.length; i++)
{
var fieldName = data.allSelectedFields[i];
var fieldToDisplay = data.allColumnsAliases[i];
var fieldToDisplay = data.allSelectedFields[i];
if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
{
fieldToDisplay = data.allColumnsAliases[i];
}
strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
$("#addField").append(strDropDown);
application/views/widgets/filter/selectFilters.php
+6 -1
View File
@@ -219,7 +219,12 @@
for (var i = 0; i < data.allSelectedFields.length; i++)
{
var fieldName = data.allSelectedFields[i];
var fieldToDisplay = data.allColumnsAliases[i];
var fieldToDisplay = data.allSelectedFields[i];
if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
{
fieldToDisplay = data.allColumnsAliases[i];
}
strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
$("#addFilter").append(strDropDown);
application/widgets/FilterWidget.php
+1 -1
View File
@@ -884,7 +884,7 @@ class FilterWidget extends Widget
$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
}
if (isset($this->listFields) && count($selectedFields) > 0)
if (isset($this->listFields) && count($selectedFields) > 0 && is_array($this->columnsAliases) && count($this->columnsAliases) > 0)
{
$columnsAliases = array();