Merge branch 'master' into feature-63349/Cis_Menu_Aktiv_Flag

Merge branch 'feature-69389/AbmeldungSTGL_Anzeige_mit_Studiengangskuerzel'
studiengangskuerzel statt kurzbzlang
2026-06-01 20:29:29 +00:00 · 2026-04-20 16:00:28 +02:00 · 2026-04-17 12:37:49 +02:00 · 2026-04-17 12:35:55 +02:00 · 2025-11-25 10:48:57 +01:00 · 2025-08-26 12:00:56 +02:00
2 changed files with 6 additions and 3 deletions
@@ -236,7 +236,7 @@ class Content_model extends DB_Model
 							LEFT JOIN
 								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=?
 							WHERE
-								sichtbar=true
+								sichtbar=true AND c1.aktiv = true
 						) s2
 						LEFT JOIN
 							campus.tbl_contentsprache s3 USING(content_id, sprache)
@@ -277,7 +277,7 @@ class Content_model extends DB_Model
 			JOIN 
 				campus.tbl_contentsprache s USING(contentsprache_id)
 			LEFT JOIN 
-				campus.tbl_contentchild k ON(m.content_id=k.content_id)
+				campus.tbl_contentchild k ON(m.content_id=k.content_id) and c.aktiv = true
 			WHERE EXISTS (
 				SELECT 1 
 				FROM campus.tbl_contentgruppe 
@@ -594,7 +594,10 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
+			. $this->dbTable . ".bezeichnung, ', ', "
+			. "UPPER(" . $this->dbTable . ".typ), "
+			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");

 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(
Author	SHA1	Message	Date
Harald Bamberger	6e103480cc	Merge branch 'master' into feature-63349/Cis_Menu_Aktiv_Flag	2026-04-20 16:00:28 +02:00
Harald Bamberger	98a10a2f55	Merge branch 'feature-69389/AbmeldungSTGL_Anzeige_mit_Studiengangskuerzel'	2026-04-17 12:37:49 +02:00
Harald Bamberger	e48b94b858	studiengangskuerzel statt kurzbzlang	2026-04-17 12:35:55 +02:00
ma0068	38e8f91fdf	add kurzbzlang to studentDropdown suggestion	2025-11-25 10:48:57 +01:00
SimonGschnell	f69016883c	update(Cis Menu Content aktiv): changes the menu content query so that only aktiv content is filtered and returned to the frontend	2025-08-26 12:00:56 +02:00
SimonGschnell	c10baca137	update(Cis Menu deactive content): filters all content out of the cis menu that has not set the active flag	2025-08-18 13:44:35 +02:00