summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Manuel <nilslice@gmail.com>2016-10-22 03:21:29 -0700
committerSteve Manuel <nilslice@gmail.com>2016-10-22 03:21:29 -0700
commitaf228ca00a4c816f03c3b46f4cf11f26fe32455e (patch)
treea14a599215f918b22397d697a970bc7b2410e412
parentc8343342aa4f8e545c9020a2003a2427387db9a7 (diff)
debugging update user handler and db code
-rw-r--r--system/admin/admin.go2
-rw-r--r--system/admin/handlers.go2
-rw-r--r--system/db/user.go4
3 files changed, 4 insertions, 4 deletions
diff --git a/system/admin/admin.go b/system/admin/admin.go
index 2ebf1b3..285bb8b 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -339,7 +339,7 @@ func UsersList(req *http.Request) ([]byte, error) {
}
var usrs []user.User
- for i, _ := range jj {
+ for i := range jj {
var u user.User
err = json.Unmarshal(jj[i], &u)
if err != nil {
diff --git a/system/admin/handlers.go b/system/admin/handlers.go
index 6f73705..46002d2 100644
--- a/system/admin/handlers.go
+++ b/system/admin/handlers.go
@@ -299,7 +299,7 @@ func configUsersEditHandler(res http.ResponseWriter, req *http.Request) {
updatedUser.ID = usr.ID
// set user in db
- err = db.UpdateUser(updatedUser)
+ err = db.UpdateUser(usr, updatedUser)
if err != nil {
fmt.Println(err)
res.WriteHeader(http.StatusInternalServerError)
diff --git a/system/db/user.go b/system/db/user.go
index 170b331..2e449b8 100644
--- a/system/db/user.go
+++ b/system/db/user.go
@@ -59,7 +59,7 @@ func SetUser(usr *user.User) (int, error) {
}
// UpdateUser sets key:value pairs in the db for existing user settings
-func UpdateUser(usr *user.User) error {
+func UpdateUser(usr, updatedUsr *user.User) error {
err := store.Update(func(tx *bolt.Tx) error {
email := []byte(usr.Email)
users := tx.Bucket([]byte("_users"))
@@ -71,7 +71,7 @@ func UpdateUser(usr *user.User) error {
}
// marshal User to json and put into bucket
- j, err := json.Marshal(usr)
+ j, err := json.Marshal(updatedUsr)
if err != nil {
return err
}