Apply to changes from master

This commit is contained in:
cgfhtw
2024-03-12 15:08:33 +01:00
parent 1a39abf7c7
commit 77ebf1d857
3 changed files with 12 additions and 29 deletions
+4 -4
View File
@@ -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');
});
@@ -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
-20
View File
@@ -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',