diff options
| -rw-r--r-- | system/admin/admin.go | 18 | ||||
| -rw-r--r-- | system/admin/handlers.go | 1 |
2 files changed, 12 insertions, 7 deletions
diff --git a/system/admin/admin.go b/system/admin/admin.go index 2b5696e..2ebf1b3 100644 --- a/system/admin/admin.go +++ b/system/admin/admin.go @@ -5,6 +5,7 @@ package admin import ( "bytes" "encoding/json" + "fmt" "html/template" "net/http" @@ -319,26 +320,30 @@ func UsersList(req *http.Request) ([]byte, error) { // get current user out to pass as data to execute template j, err := db.CurrentUser(req) if err != nil { + fmt.Println("CurrentUser") return nil, err } - usr := &user.User{} - err = json.Unmarshal(j, usr) + var usr user.User + err = json.Unmarshal(j, &usr) if err != nil { + fmt.Println("Unmarshal usr") return nil, err } // get all users to list jj, err := db.UserAll() if err != nil { + fmt.Println("UserAll") return nil, err } - var usrs []*user.User - for i := range jj { - u := &user.User{} - err = json.Unmarshal(jj[i], u) + var usrs []user.User + for i, _ := range jj { + var u user.User + err = json.Unmarshal(jj[i], &u) if err != nil { + fmt.Println("Unmarshal in jj", jj[i]) return nil, err } if u.Email != usr.Email { @@ -356,6 +361,7 @@ func UsersList(req *http.Request) ([]byte, error) { err = tmpl.Execute(buf, data) if err != nil { + fmt.Println("Execute") return nil, err } diff --git a/system/admin/handlers.go b/system/admin/handlers.go index 388423c..6f73705 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -185,7 +185,6 @@ func configUsersHandler(res http.ResponseWriter, req *http.Request) { return } - res.Header().Set("Content-Type", "text/html") res.Write(view) case http.MethodPost: |