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

filter.js: fix for nested tabulator: set columns before set data, filtersupdate: renamed columns

Browse Source
This commit is contained in:
KarpAlex
2023-07-04 12:17:15 +02:00
parent 388400338e
commit fc147f577a
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/filter/Filter.js
+1 -1
View File
@@ -226,9 +226,9 @@ export const CoreFilterCmpt = {
}
},
_updateTabulator() {
this.tabulator.setColumns(this.filteredColumns);
this.tabulator.setData(this.filteredData);
this.tabulatorHasSelector = this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
this.tabulator.setColumns(this.filteredColumns);
},
/**
*
system/filtersupdate.php
+6 -7
View File
@@ -1268,13 +1268,12 @@ $filters = array(
{
"name": "SoftwareManagement",
"columns": [
{"name": "Software Kurzbezeichnung"},
{"name": "Version"},
{"name": "Beschreibung"},
{"name": "Hersteller"},
{"name": "Betriebssystem"},
{"name": "Aktiv"},
{"name": "Softwarestatus Kurzbezeichnung"}
{"name": "software_kurzbz"},
{"name": "version"},
{"name": "beschreibung"},
{"name": "hersteller"},
{"name": "os"},
{"name": "aktiv"}
],
"filters": []
}