From fc147f577ab8fe529bad4ced7bd9d8f022bf649e Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Tue, 4 Jul 2023 12:17:15 +0200
Subject: [PATCH] filter.js: fix for nested tabulator: set columns before set
 data, filtersupdate: renamed columns

---
 public/js/components/filter/Filter.js |  2 +-
 system/filtersupdate.php              | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 776405614..9c53afdef 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -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);
 		},
 		/**
 		 *
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 8652f4316..1c303ad43 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -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": []
 			}