From 971d30f927e83f15ddde6b9d7dc189ac736492ad Mon Sep 17 00:00:00 2001 From: Chris Mann Date: Wed, 26 Jul 2023 11:16:52 +0200 Subject: [PATCH] Refactoring --- model-user.go | 1 + view-invite.go | 2 +- view-user.go | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/model-user.go b/model-user.go index 51d3051..8778fde 100644 --- a/model-user.go +++ b/model-user.go @@ -28,6 +28,7 @@ func get(user User, config *ConfigFile, ldapConn *ldap.Conn) (*User, error) { "sn", "mail", "description", + "carLicense", }, nil) searchRes, err := ldapConn.Search(searchReq) diff --git a/view-invite.go b/view-invite.go index 733f026..3f8e9ad 100644 --- a/view-invite.go +++ b/view-invite.go @@ -220,7 +220,7 @@ func handleNewAccount(w http.ResponseWriter, r *http.Request, l *ldap.Conn, invi data.Common.Success = false data.Common.ErrorMessage = err.Error() } - http.Redirect(w, r, "/admin/activate", http.StatusFound) + http.Redirect(w, r, "/user/wait", http.StatusFound) } // tryCreateAccount(l, data, password1, password2, invitedBy) diff --git a/view-user.go b/view-user.go index 40c3671..d0f9f31 100644 --- a/view-user.go +++ b/view-user.go @@ -11,7 +11,12 @@ import ( func handleUserWait(w http.ResponseWriter, r *http.Request) { templateProfile := getTemplate("user/wait.html") - templateProfile.Execute(w, nil) + templateProfile.Execute(w, HomePageData{ + Common: NestedCommonTplData{ + CanAdmin: false, + LoggedIn: false, + }, + }) } func handleUser(w http.ResponseWriter, r *http.Request) {