minor fix on API response

diff --git a/cmd/web.go b/cmd/web.go
index ae4403c0cacf47831a71bf55fcd8d24afec253ff..05daf558b01df0e53262040872e3d780678d1a2c 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -232,6 +232,8 @@ func runWeb(ctx *cli.Context) {
                        m.Combo("/user/repos", middleware.ApiReqToken()).Get(v1.ListMyRepos).
                                Post(bind(api.CreateRepoOption{}), v1.CreateRepo)
                        m.Post("/org/:org/repos", middleware.ApiReqToken(), bind(api.CreateRepoOption{}), v1.CreateOrgRepo)
+
+                       // TODO: https://github.com/gogits/go-gogs-client/wiki
                        m.Group("/repos", func() {
                                m.Get("/search", v1.SearchRepos)
                                m.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), v1.MigrateRepo)

diff --git a/models/access.go b/models/access.go
index 8d698f151da1eb1a1d800a300164cd97d6031493..917f1c280de904870cd2b65ca9498e754b728b2b 100644 (file)
--- a/models/access.go
+++ b/models/access.go
@@ -68,7 +68,7 @@ func HasAccess(u *User, repo *Repository, testMode AccessMode) (bool, error) {
 }
 
 // GetAccessibleRepositories finds all repositories where a user has access to,
-// besides his own.
+// besides he/she owns.
 func (u *User) GetAccessibleRepositories() (map[*Repository]AccessMode, error) {
        accesses := make([]*Access, 0, 10)
        if err := x.Find(&accesses, &Access{UserID: u.Id}); err != nil {

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index f1d6c91af58ccfa696a87f2c0dd3b3fc83da1144..08a503e6dacf9f2c44cf0308c6e1ba7cb2cbf73a 100644 (file)
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -470,7 +470,7 @@ func trimCommitActionAppUrlPrefix(x *xorm.Engine) error {
                if _, err = sess.Id(actID).Update(&Action{
                        Content: string(p),
                }); err != nil {
-                       return fmt.Errorf("update action[%s]: %v", actID, err)
+                       return fmt.Errorf("update action[%d]: %v", actID, err)
                }
        }
        return sess.Commit()

diff --git a/routers/api/v1/repo.go b/routers/api/v1/repo.go
index c6dabfcb86d1a537f081abf39f41845f6efb3eaa..3f5394172abb167dfb5378f1f4785d07a42f39fa 100644 (file)
--- a/routers/api/v1/repo.go
+++ b/routers/api/v1/repo.go
@@ -120,7 +120,7 @@ func createRepo(ctx *middleware.Context, owner *models.User, opt api.CreateRepoO
                return
        }
 
-       ctx.JSON(200, ToApiRepository(owner, repo, api.Permission{true, true, true}))
+       ctx.JSON(201, ToApiRepository(owner, repo, api.Permission{true, true, true}))
 }
 
 // POST /user/repos
@@ -254,17 +254,11 @@ func ListMyRepos(ctx *middleware.Context) {
        i := numOwnRepos
 
        for repo, access := range accessibleRepos {
-               if err = repo.GetOwner(); err != nil {
-                       ctx.JSON(500, &base.ApiJsonErr{"GetOwner: " + err.Error(), base.DOC_URL})
-                       return
-               }
-
-               repos[i] = ToApiRepository(repo.Owner, repo, api.Permission{false, access >= models.ACCESS_MODE_WRITE, true})
-
-               // FIXME: cache result to reduce DB query?
-               if repo.Owner.IsOrganization() && repo.Owner.IsOwnedBy(ctx.User.Id) {
-                       repos[i].Permissions.Admin = true
-               }
+               repos[i] = ToApiRepository(repo.Owner, repo, api.Permission{
+                       Admin: access >= models.ACCESS_MODE_ADMIN,
+                       Push:  access >= models.ACCESS_MODE_WRITE,
+                       Pull:  true,
+               })
                i++
        }
 

diff --git a/routers/api/v1/user.go b/routers/api/v1/user.go
index 60b6adcd120f470607cfc9c3236f160012ed183c..57bf68bb566f798b099783d43ec1de12fca075a2 100644 (file)
--- a/routers/api/v1/user.go
+++ b/routers/api/v1/user.go
@@ -12,7 +12,6 @@ import (
        "github.com/gogits/gogs/models"
        "github.com/gogits/gogs/modules/base"
        "github.com/gogits/gogs/modules/middleware"
-       "github.com/gogits/gogs/modules/setting"
 )
 
 // ToApiUser converts user to API format.
@@ -20,7 +19,9 @@ func ToApiUser(u *models.User) *api.User {
        return &api.User{
                ID:        u.Id,
                UserName:  u.Name,
-               AvatarUrl: string(setting.Protocol) + u.AvatarLink(),
+               FullName:  u.FullName,
+               Email:     u.Email,
+               AvatarUrl: u.AvatarLink(),
        }
 }