Mercurial > gemma
diff pkg/controllers/user.go @ 442:fc37e7072022
Moved some models used in controllers to to model package because they may be needed elsewhere (e.g. GeoServer config).
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 21 Aug 2018 16:57:55 +0200 |
| parents | c49f4c1808b1 |
| children | b2dc9c2f69e0 |
line wrap: on
line diff
--- a/pkg/controllers/user.go Tue Aug 21 14:59:36 2018 +0200 +++ b/pkg/controllers/user.go Tue Aug 21 16:57:55 2018 +0200 @@ -8,6 +8,7 @@ "github.com/gorilla/mux" "gemma.intevation.de/gemma/pkg/auth" + "gemma.intevation.de/gemma/pkg/models" ) const ( @@ -57,7 +58,7 @@ ) (jr JSONResult, err error) { user := mux.Vars(req)["user"] - if !UserName(user).isValid() { + if !models.UserName(user).IsValid() { err = JSONError{http.StatusBadRequest, "error: user invalid"} return } @@ -94,13 +95,13 @@ db *sql.DB, ) (jr JSONResult, err error) { - user := UserName(mux.Vars(req)["user"]) - if !user.isValid() { + user := models.UserName(mux.Vars(req)["user"]) + if !user.IsValid() { err = JSONError{http.StatusBadRequest, "error: user invalid"} return } - newUser := input.(*User) + newUser := input.(*models.User) var res sql.Result if s, _ := auth.GetSession(req); s.Roles.Has("sys_admin") { @@ -173,7 +174,7 @@ db *sql.DB, ) (jr JSONResult, err error) { - user := input.(*User) + user := input.(*models.User) if user.Extent == nil { _, err = db.Exec( @@ -223,10 +224,10 @@ } defer rows.Close() - var users []*User + var users []*models.User for rows.Next() { - user := &User{Extent: &BoundingBox{}} + user := &models.User{Extent: &models.BoundingBox{}} if err = rows.Scan( &user.Role, &user.User, @@ -242,7 +243,7 @@ jr = JSONResult{ Result: struct { - Users []*User `json:"users"` + Users []*models.User `json:"users"` }{users}, } return @@ -253,15 +254,15 @@ db *sql.DB, ) (jr JSONResult, err error) { - user := UserName(mux.Vars(req)["user"]) - if !user.isValid() { + user := models.UserName(mux.Vars(req)["user"]) + if !user.IsValid() { err = JSONError{http.StatusBadRequest, "error: user invalid"} return } - result := &User{ + result := &models.User{ User: user, - Extent: &BoundingBox{}, + Extent: &models.BoundingBox{}, } err = db.QueryRow(listUserSQL, user).Scan(