From 8bcad65fd4c6934ebb1a1d103441f715a033010e Mon Sep 17 00:00:00 2001
From: cangui <canguijc@gmail.com>
Date: Sun, 11 May 2025 08:32:43 +0200
Subject: [PATCH] update mail

---
 backend/renders/renders.go                | 32 +++++++++++++++++++++--
 frontend/templates/admin_users.pages.tmpl | 18 ++++++-------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/backend/renders/renders.go b/backend/renders/renders.go
index 43fecf3..eb1d4bd 100644
--- a/backend/renders/renders.go
+++ b/backend/renders/renders.go
@@ -37,6 +37,15 @@ func AdminUserList(db *gorm.DB) http.HandlerFunc {
 		data := map[string]interface{}{
 			"Users": users,
 		}
+		if _, exists := data["User"]; !exists {
+			if val := r.Context().Value("ssoid"); val != nil {
+				ssoid := val.(string)
+				var user models.User
+				if err := db.Where("sso_id = ?", ssoid).First(&user).Error; err == nil {
+					data["User"] = user
+				}
+			}
+		}
 
 		renderTemplate(w, "admin_users", data)
 	}
@@ -53,7 +62,16 @@ func AdminUserEdit(db *gorm.DB) http.HandlerFunc {
 		data := map[string]interface{}{
 			"User": user,
 		}
-		renderPartial(w, "admin_user_edit", data)
+		if _, exists := data["User"]; !exists {
+			if val := r.Context().Value("ssoid"); val != nil {
+				ssoid := val.(string)
+				var user models.User
+				if err := db.Where("sso_id = ?", ssoid).First(&user).Error; err == nil {
+					data["User"] = user
+				}
+			}
+		}
+		renderTemplate(w, "admin_user_edit", data)
 	}
 }
 func CreateUserHandler(db *gorm.DB) http.HandlerFunc {
@@ -112,6 +130,7 @@ func CreateUserHandler(db *gorm.DB) http.HandlerFunc {
 }
 func AdminUserCreateForm() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+
 		renderPartial(w, "admin_user_create", nil)
 	}
 }
@@ -165,8 +184,17 @@ func AdminUserEditForm(db *gorm.DB) http.HandlerFunc {
 		data := map[string]interface{}{
 			"User": user,
 		}
+		if _, exists := data["User"]; !exists {
+			if val := r.Context().Value("ssoid"); val != nil {
+				ssoid := val.(string)
+				var user models.User
+				if err := db.Where("sso_id = ?", ssoid).First(&user).Error; err == nil {
+					data["User"] = user
+				}
+			}
+		}
 
-		renderPartial(w, "admin_user_edit", data)
+		renderTemplate(w, "admin_user_edit", data)
 	}
 }
 func AdminUserUpdate(db *gorm.DB) http.HandlerFunc {
diff --git a/frontend/templates/admin_users.pages.tmpl b/frontend/templates/admin_users.pages.tmpl
index 5ac9773..9de7e19 100644
--- a/frontend/templates/admin_users.pages.tmpl
+++ b/frontend/templates/admin_users.pages.tmpl
@@ -8,12 +8,11 @@
 
 <!-- Bouton création -->
 <div class="mb-4">
-  <button class="button is-primary" 
-          hx-get="/admin/user/create-form" 
-          hx-target="#createForm" 
-          hx-swap="innerHTML">
+  <a class="button is-primary" 
+          href="/admin/user/create-form" 
+        >
     ➕ Ajouter un utilisateur
-  </button>
+</a>
 </div>
 
 <!-- Formulaire création -->
@@ -38,12 +37,11 @@
       <td>{{ .Role }}</td>
       <td>{{ if .IsActive }}✅{{ else }}❌{{ end }}</td>
       <td>
-        <button class="button is-small is-info"
-                hx-get="/admin/user/{{ .ID }}/edit"
-                hx-target="#editForm"
-                hx-swap="innerHTML">
+        <a class="button is-small is-info"
+                href="/admin/user/{{ .ID }}/edit"
+                >
           ✏️ Modifier
-        </button>
+      </a>
         <button class="button is-small is-danger"
                 hx-delete="/api/user/delete/{{ .ID }}"
                 hx-confirm="Confirmer suppression ?"