From 1f68ca7ce5260fcc98d10c7bb40d8a8273389beb Mon Sep 17 00:00:00 2001
From: Dasan05 <dasan.ibrahim@student.reutlingen-university.de>
Date: Mon, 2 Jun 2025 20:11:22 +0200
Subject: [PATCH] Bug fixing
---
src/app/eiffel/web.go | 6 +-----
src/app/template/web/web.go | 3 ++-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/app/eiffel/web.go b/src/app/eiffel/web.go
index ea342c2..57d97d7 100644
--- a/src/app/eiffel/web.go
+++ b/src/app/eiffel/web.go
@@ -385,13 +385,9 @@ func registerNavigation(appCtx *hctx.AppCtx, webCtx *web.Ctx) {
// GEÄNDERT: URL korrigiert von "/project/list" zu "/project/list"
webCtx.Navigation.Add("eiffel.project.collection", web.NavItem{
-<<<<<<< HEAD
- URL: "/project/list", // Die URL zu deiner Projekt-Sammlung-Seite
- Name: "Projekt-Sammlung", // Der Name, der angezeigt wird
-=======
+
URL: "/project/list", // Korrekte URL für das neue Project-Modul
Name: "Projekt-Sammlung",
->>>>>>> 2cbb95617aafc4005076b095bfb267b99d92f96d
Display: func(io web.IO) (bool, error) {
return true, nil
},
diff --git a/src/app/template/web/web.go b/src/app/template/web/web.go
index c1fdc98..9bff4ec 100644
--- a/src/app/template/web/web.go
+++ b/src/app/template/web/web.go
@@ -3,6 +3,8 @@ package web
import (
"errors"
"fmt"
+ "net/http"
+
"github.com/google/uuid"
"github.com/org-harmony/harmony/src/app/template"
"github.com/org-harmony/harmony/src/app/user"
@@ -11,7 +13,6 @@ import (
"github.com/org-harmony/harmony/src/core/util"
"github.com/org-harmony/harmony/src/core/validation"
"github.com/org-harmony/harmony/src/core/web"
- "net/http"
)
var (
--
GitLab