update(Cis Menu Content aktiv): changes the menu content query so that only aktiv content is filtered and returned to the frontend

application/models/content/Content_model.php

@@ -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 

public/js/components/Cis/Menu.js

@@ -61,31 +61,11 @@ export default {
 		}
 	},
 	methods: {
-		filterEntries(entries) {
-			if (!entries) return entries;
-
-			const filteredEntries = entries.filter((entry)=>{
-				if(entry.aktiv)
-					return true;
-				else 
-					return false;
-			})
-			
-			filteredEntries.forEach((filteredEntry,index) => {
-				if (Array.isArray(filteredEntry?.childs) && filteredEntry?.childs.length > 0) {
-					filteredEntries[index].childs =this.filterEntries(filteredEntry.childs);
-				}	
-				
-			});
-			
-			return filteredEntries;
-		},
 		fetchMenu() {
 			return this.$api
 				.call(ApiCisMenu.getMenu())
 				.then(res => res.data)
 				.then(menu => {
-					console.log(menu,"this is the menu")
 					this.entries = menu;
 				});
 		},
@@ -170,7 +150,7 @@ export default {
 			<div class="offcanvas-body p-0">
 				<div id="nav-main-menu" class="nav-menu-collapse collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in filterEntries(entries)" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>