mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-10-12 06:54:04 +00:00
comment in groups in lvvw treemenu to have them for drag and drop, add language and isMobile injects to prevent warnings from searchbar component, studvw clear selection when degree program changes, update fontawesome from 6.1.1 to 6.7.2 and primeicons from 5.0.0 to 6.0.1 to prevent glyph bbox warnings in ff browser console
This commit is contained in:
@@ -22,10 +22,10 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
|
||||
$config['root'] = [
|
||||
'stg' => [
|
||||
'semester' => [
|
||||
/*'group',
|
||||
'group',
|
||||
'verband' => [
|
||||
'group'
|
||||
]*/
|
||||
]
|
||||
],
|
||||
'orgform'
|
||||
]
|
||||
|
||||
@@ -56,7 +56,7 @@ $configArray = [
|
||||
<router-view
|
||||
default-semester="<?= $variables['semester_aktuell']; ?>"
|
||||
active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
|
||||
stv-root="<?= site_url('Studentenverwaltung'); ?>"
|
||||
stv-root="<?= site_url('studvw'); ?>"
|
||||
cis-root="<?= CIS_ROOT; ?>"
|
||||
avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
|
||||
logout-url="<?= site_url('Cis/Auth/logout'); ?>"
|
||||
|
||||
+4
-4
@@ -109,9 +109,9 @@
|
||||
"type": "package",
|
||||
"package": {
|
||||
"name": "fortawesome/font-awesome6",
|
||||
"version": "6.1.1",
|
||||
"version": "6.7.2",
|
||||
"dist": {
|
||||
"url": "https://github.com/FortAwesome/Font-Awesome/archive/refs/tags/6.1.1.zip",
|
||||
"url": "https://github.com/FortAwesome/Font-Awesome/archive/refs/tags/6.7.2.zip",
|
||||
"type": "zip"
|
||||
}
|
||||
}
|
||||
@@ -468,7 +468,7 @@
|
||||
|
||||
"fgelinas/timepicker": "0.3.3",
|
||||
"fortawesome/font-awesome4": "4.7.*",
|
||||
"fortawesome/font-awesome6": "6.1.*",
|
||||
"fortawesome/font-awesome6": "6.7.*",
|
||||
"fzaninotto/faker": "1.*",
|
||||
"firebase/php-jwt": "^6.0",
|
||||
|
||||
@@ -496,7 +496,7 @@
|
||||
"netcarver/textile": "3.7.*",
|
||||
"nicolaskruchten/pivottable": "2.23.0",
|
||||
"npm-asset/primevue": "3.29.1",
|
||||
"npm-asset/primeicons": "5.0.0",
|
||||
"npm-asset/primeicons": "6.0.1",
|
||||
|
||||
"olifolkerd/tabulator4": "4.9.*",
|
||||
"olifolkerd/tabulator5": "5.5.*",
|
||||
|
||||
Generated
+5
-5
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "869cbc35bd1ba90ab90934fcb41b0f51",
|
||||
"content-hash": "bc21de2a48b960781c1ed028c4b8d7b9",
|
||||
"packages": [
|
||||
{
|
||||
"name": "afarkas/html5shiv",
|
||||
@@ -960,10 +960,10 @@
|
||||
},
|
||||
{
|
||||
"name": "fortawesome/font-awesome6",
|
||||
"version": "6.1.1",
|
||||
"version": "6.7.2",
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://github.com/FortAwesome/Font-Awesome/archive/refs/tags/6.1.1.zip"
|
||||
"url": "https://github.com/FortAwesome/Font-Awesome/archive/refs/tags/6.7.2.zip"
|
||||
},
|
||||
"type": "library"
|
||||
},
|
||||
@@ -1565,10 +1565,10 @@
|
||||
},
|
||||
{
|
||||
"name": "npm-asset/primeicons",
|
||||
"version": "5.0.0",
|
||||
"version": "6.0.1",
|
||||
"dist": {
|
||||
"type": "tar",
|
||||
"url": "https://registry.npmjs.org/primeicons/-/primeicons-5.0.0.tgz"
|
||||
"url": "https://registry.npmjs.org/primeicons/-/primeicons-6.0.1.tgz"
|
||||
},
|
||||
"type": "npm-asset",
|
||||
"license": [
|
||||
|
||||
@@ -49,10 +49,13 @@ export default {
|
||||
permissionLehrveranstaltung: this.permissions['lehre/lehrveranstaltung'],
|
||||
permissionGruppenEntfernen: this.permissions['lv-plan/gruppenentfernen'],
|
||||
permissionLektorEntfernen: this.permissions['lv-plan/lektorentfernen'],
|
||||
language: Vue.computed(() => this.$p.user_language),
|
||||
isMobile: false,
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
sidebarCollapsed: false,
|
||||
appconfig:{},
|
||||
configEndpoints: ApiLvConfig,
|
||||
selected: [],
|
||||
|
||||
@@ -89,8 +89,9 @@ export default {
|
||||
hasZGVMasterPermission: this.permissions['student/editMakkZgv'],
|
||||
hasZGVDoctorPermission: this.permissions['student/editDokZgv'],
|
||||
hasBismeldenPermission: this.permissions['student/editBismelden'],
|
||||
authUid: this.authUid
|
||||
|
||||
authUid: this.authUid,
|
||||
language: Vue.computed(() => this.$p.user_language),
|
||||
isMobile: false,
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@@ -313,6 +314,11 @@ export default {
|
||||
sidebarCollapsed(newVal) {
|
||||
if(newVal) this.$refs.hSplit.collapseLeft()
|
||||
else this.$refs.hSplit.showBoth()
|
||||
},
|
||||
studiengangKz(newVal, oldVal) {
|
||||
if (newVal !== oldVal) {
|
||||
this.$refs.stvList.clearSelection();
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
Reference in New Issue
Block a user