blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-11 17:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

FilterWidget -> Header -> Dropdowns shows only the columns that are not displayed yet

Browse Source
This commit is contained in:
Paolo
2018-03-01 14:37:43 +01:00
parent e86a7f1e57
commit 3e990c620f
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/widgets/filter/selectFields.php
+8 -5
View File
@@ -196,13 +196,16 @@
var fieldName = data.allSelectedFields[i];
var fieldToDisplay = data.allSelectedFields[i];
if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
if (data.selectedFields.indexOf(fieldName) < 0)
{
fieldToDisplay = data.allColumnsAliases[i];
}
if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
{
fieldToDisplay = data.allColumnsAliases[i];
}
strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
$("#addField").append(strDropDown);
strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
$("#addField").append(strDropDown);
}
}
}
application/views/widgets/filter/selectFilters.php
+17 -14
View File
@@ -216,20 +216,6 @@
var strDropDown = '<option value="">Select a filter to add...</option>';
$("#addFilter").append(strDropDown);
for (var i = 0; i < data.allSelectedFields.length; i++)
{
var fieldName = data.allSelectedFields[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);
}
for (var i = 0; i < data.selectedFilters.length; i++)
{
var selectedFilters = '<div>';
@@ -253,6 +239,23 @@
$("#selectedFilters").append(selectedFilters);
}
for (var i = 0; i < data.allSelectedFields.length; i++)
{
var fieldName = data.allSelectedFields[i];
var fieldToDisplay = data.allSelectedFields[i];
if (data.selectedFilters.indexOf(fieldName) < 0)
{
if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
{
fieldToDisplay = data.allColumnsAliases[i];
}
strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
$("#addFilter").append(strDropDown);
}
}
}
addEventsSFilters();