Merge branch 'cis40_2026-09_ma_rc' into demo-cis40

application/controllers/api/frontend/v1/LvMenu.php

@@ -379,8 +379,7 @@ class LvMenu extends FHCAPI_Controller
 					'name'=>$this->p->t('lehre', 'gesamtnote'),
 					'phrase' => 'lehre/gesamtnote',
 					'c4_icon'=> base_url('skin/images/button_endnote.png'),
-					'c4_link'=> base_url('cis.php/Cis/Compat/legacy/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
-					//'c4_link'=> site_url('Cis/Benotungstool/'.urlencode($lvid).'/'.urlencode($angezeigtes_stsem))
+					'c4_link'=> site_url('Cis/Benotungstool/'.urlencode($lvid).'/'.urlencode($angezeigtes_stsem))
 					//'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 					//'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 				);

public/js/components/Bootstrap/Modal.js

@@ -103,6 +103,13 @@ export default {
 				keyboard: this.keyboard
 			});
 	},
+	//to avoid pagelocks if more than one instance
+	beforeUnmount() {
+		if (this.modal) {
+			this.modal.dispose();
+			this.modal = null;
+		}
+	},
 	popup(body, options, title, footer) {
 		const BsModal = this,
 			slots = {};
@@ -157,17 +164,7 @@ export default {
 			});
 		});
 	},
-	template: `
-	<div
-		ref="modal"
-		class="bootstrap-modal modal"
-		tabindex="-1"
-		@[\`hide.bs.modal\`]="$emit('hideBsModal', $event)"
-		@[\`hidden.bs.modal\`]="$emit('hiddenBsModal', $event)"
-		@[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal', $event)"
-		@[\`show.bs.modal\`]="$emit('showBsModal', $event)"
-		@[\`shown.bs.modal\`]="$emit('shownBsModal', $event)"
-	>
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
 		<div class="modal-dialog" :class="fullscreen ? 'modal-fullscreen' : dialogClass">
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header" :class="headerClass">

public/js/components/Stv/Studentenverwaltung.js

@@ -515,7 +515,7 @@ export default {
 	},
 	template: /* html */`
 		<div class="stv" :class="{ 'sidebar-collapsed': sidebarCollapsed }">
-		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
+		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow" style="background-color: green !important;">
 			<div class="col-md-4 col-lg-3 col-xl-2 d-flex align-items-center">
 				<button
 					class="btn btn-outline-light border-0 m-1 collapsed"
@@ -528,7 +528,12 @@ export default {
 				>
 					<span class="svg-icon svg-icon-apps"></span>
 				</button>
-				<a class="navbar-brand me-0" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
+				<a class="navbar-brand me-0" :href="stvRoot">
+					<span style="font-size: 10px; line-height: 1; display: block; width: 100%; text-wrap: wrap; text-align: left;">
+						DEMO Datenstand 29.09.2026
+					</span>
+					StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}
+				</a>
 				<button
 					class="btn btn-outline-light border-0 d-none d-md-inline-flex m-1  ms-auto"
 					type="button"

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js

@@ -317,7 +317,7 @@ export default {
 		<div class="stv-details-kontakt-contact h-100 pt-3">
 
 		<!--Modal: contactModal-->
-		<bs-modal ref="contactModal" @hideBsModal.stop="">
+		<bs-modal ref="contactModal">
 			<template #title>
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('person', 'kontakt_new')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('person', 'kontakt_edit')}}</p>

public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js

@@ -604,11 +604,9 @@ export default {
 
 	<!--Modal: KontaktdatenModal -->
 	<bs-modal
-		v-if="autocompleteSelectedBetreuer && autocompleteSelectedBetreuer.person_id"
-		@hideBsModal.stop=""
 		ref="kontaktdatenModal"
 		dialog-class="modal-xl modal-dialog-scrollable"
-	>
+		v-if="autocompleteSelectedBetreuer && autocompleteSelectedBetreuer.person_id">
 
 		<template #title>
 			<p class="fw-bold mt-3">{{$p.t('projektarbeit', 'kontaktdatenBearbeiten')}}</p>

public/vendor

@@ -0,0 +1 @@
+../vendor