diff --git a/grav-admin/user/js/registration/registration.vue b/grav-admin/user/js/registration/registration.vue index 4c0a143..6638bcc 100644 --- a/grav-admin/user/js/registration/registration.vue +++ b/grav-admin/user/js/registration/registration.vue @@ -23,7 +23,7 @@ function create(user) { }).then(resp => { console.log(resp) if (resp.ok) { - return resp.json() + return resp.json().then(u => { err.value = "" }) } else { resp.text().then( e => err.value = e) } diff --git a/skouter.go b/skouter.go index ad607ad..d6d8a14 100644 --- a/skouter.go +++ b/skouter.go @@ -1262,7 +1262,8 @@ func (estimate *Estimate) insertResults(db *sql.DB) error { return nil } -func insertUser(db *sql.DB, user User) (User, error) { +// Insert user returning it's ID or any error +func insertUser(db *sql.DB, user User) (int, error) { var query string var row *sql.Row var err error @@ -1270,7 +1271,7 @@ func insertUser(db *sql.DB, user User) (User, error) { user.Address.Id, err = insertAddress(db, user.Address) if err != nil { - return user, err + return 0, err } query = `INSERT INTO user @@ -1313,15 +1314,12 @@ func insertUser(db *sql.DB, user User) (User, error) { err = row.Scan(&id) if err != nil { - return User{}, err + return 0, err } - user, err = queryUser(db, id) - if err != nil { - return User{}, err - } + user.Id = id - return user, nil + return id, nil } func updateAddress(address Address, db *sql.DB) error { @@ -1527,7 +1525,7 @@ func createUser(w http.ResponseWriter, db *sql.DB, r *http.Request) { return } - user, err = insertUser(db, user) + user.Id, err = insertUser(db, user) if err != nil { http.Error(w, err.Error(), 422) return @@ -3028,12 +3026,12 @@ func seedUsers(db *sql.DB, addresses []Address, branches []Branch) []User { users[2].Role = "Admin" for i := range users { - u, err := insertUser(db, users[i]) + var err error + users[i].Id, err = insertUser(db, users[i]) if err != nil { log.Println(err) break } - users[i].Id = u.Id } return users