diff options
Diffstat (limited to 'internal/route/api/v1')
| -rw-r--r-- | internal/route/api/v1/admin/user.go | 12 | ||||
| -rw-r--r-- | internal/route/api/v1/repo/repo.go | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go index 5e291df2..d159e6d7 100644 --- a/internal/route/api/v1/admin/user.go +++ b/internal/route/api/v1/admin/user.go @@ -5,10 +5,9 @@ package admin import ( - user2 "gogs.io/gogs/internal/route/api/v1/user" "net/http" - log "gopkg.in/clog.v1" + log "unknwon.dev/clog/v2" api "github.com/gogs/go-gogs-client" @@ -16,6 +15,7 @@ import ( "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/db/errors" "gogs.io/gogs/internal/mailer" + "gogs.io/gogs/internal/route/api/v1/user" "gogs.io/gogs/internal/setting" ) @@ -76,7 +76,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) { } func EditUser(c *context.APIContext, form api.EditUserOption) { - u := user2.GetUserByParams(c) + u := user.GetUserByParams(c) if c.Written() { return } @@ -131,7 +131,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) { } func DeleteUser(c *context.APIContext) { - u := user2.GetUserByParams(c) + u := user.GetUserByParams(c) if c.Written() { return } @@ -151,9 +151,9 @@ func DeleteUser(c *context.APIContext) { } func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) { - u := user2.GetUserByParams(c) + u := user.GetUserByParams(c) if c.Written() { return } - user2.CreateUserPublicKey(c, form, u.ID) + user.CreateUserPublicKey(c, form, u.ID) } diff --git a/internal/route/api/v1/repo/repo.go b/internal/route/api/v1/repo/repo.go index 096096fb..6950ce9b 100644 --- a/internal/route/api/v1/repo/repo.go +++ b/internal/route/api/v1/repo/repo.go @@ -6,11 +6,10 @@ package repo import ( "fmt" - convert2 "gogs.io/gogs/internal/route/api/v1/convert" "net/http" "path" - log "gopkg.in/clog.v1" + log "unknwon.dev/clog/v2" api "github.com/gogs/go-gogs-client" @@ -18,6 +17,7 @@ import ( "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/db/errors" "gogs.io/gogs/internal/form" + "gogs.io/gogs/internal/route/api/v1/convert" "gogs.io/gogs/internal/setting" ) @@ -25,7 +25,7 @@ func Search(c *context.APIContext) { opts := &db.SearchRepoOptions{ Keyword: path.Base(c.Query("q")), OwnerID: c.QueryInt64("uid"), - PageSize: convert2.ToCorrectPageSize(c.QueryInt("limit")), + PageSize: convert.ToCorrectPageSize(c.QueryInt("limit")), Page: c.QueryInt("page"), } @@ -173,7 +173,7 @@ func CreateUserRepo(c *context.APIContext, owner *db.User, opt api.CreateRepoOpt } else { if repo != nil { if err = db.DeleteRepository(c.User.ID, repo.ID); err != nil { - log.Error(2, "DeleteRepository: %v", err) + log.Error("DeleteRepository: %v", err) } } c.ServerError("CreateRepository", err) @@ -270,7 +270,7 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) { if err != nil { if repo != nil { if errDelete := db.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { - log.Error(2, "DeleteRepository: %v", errDelete) + log.Error("DeleteRepository: %v", errDelete) } } |