From 77ebf1d85732f21c18708e956d8b2ec9afc8e28f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 12 Mar 2024 15:08:33 +0100
Subject: [PATCH] Apply to changes from master

---
 public/js/apps/Studentenverwaltung.js         |  8 ++++----
 .../Stv/Studentenverwaltung/List.js           | 13 +++++++-----
 system/phrasesupdate.php                      | 20 -------------------
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index e1dacf792..dc3e7522b 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -18,8 +18,8 @@
 import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
-import FhcAlert from "../plugin/FhcAlert.js";
-import FhcPhrasen from "../plugin/Phrasen.js";
+import FhcApi from "../plugin/FhcApi.js";
+import Phrasen from "../plugin/Phrasen.js";
 
 //import PrimeVue form "../../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js");
 //const PrimeVue = await import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").default;
@@ -47,7 +47,7 @@ import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_route
 				overlay: 1100
 			}
 		})
-		.use(FhcAlert)
-		.use(FhcPhrasen)
+		.use(FhcApi)
+		.use(Phrasen)
 		.mount('#main');
 });
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index f3e1b1bc0..c9c5ecb26 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -112,11 +112,14 @@ export default {
 			this.lastSelected = first ? undefined : this.selected;
 			if (url)
 				url = CoreRESTClient._generateRouterURI(url);
-			if (!this.$refs.table.tableBuilt)
-				this.$refs.table.tabulator.on("tableBuilt", () => {
-					this.$refs.table.tabulator.setData(url);
-				});
-			else
+			if (!this.$refs.table.tableBuilt) {
+				if (!this.$refs.table.tabulator) {
+					this.tabulatorOptions.ajaxURL = url;
+				} else
+					this.$refs.table.tabulator.on("tableBuilt", () => {
+						this.$refs.table.tabulator.setData(url);
+					});
+			} else
 				this.$refs.table.tabulator.setData(url);
 		},
 		onKeydown(e) { // TODO(chris): this should be in the filter component
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 597527f09..a7dabcf79 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2281,26 +2281,6 @@ $phrases = array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'plz',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'plz',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'code',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'person',