Fix /api/v1/orgs/* endpoints by changing parameter to :org from :orgname (#11381)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index e4288f40f650bd224396b18e0eb19d667a28599f..a19666ff53119c9b0544a135118e27178228d0a0 100644 (file)
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -382,7 +382,7 @@ func orgAssignment(args ...bool) macaron.Handler {
 
                var err error
                if assignOrg {
-                       ctx.Org.Organization, err = models.GetOrgByName(ctx.Params(":orgname"))
+                       ctx.Org.Organization, err = models.GetOrgByName(ctx.Params(":org"))
                        if err != nil {
                                if models.IsErrOrgNotExist(err) {
                                        ctx.NotFound()
@@ -808,7 +808,7 @@ func RegisterRoutes(m *macaron.Macaron) {
                m.Get("/user/orgs", reqToken(), org.ListMyOrgs)
                m.Get("/users/:username/orgs", org.ListUserOrgs)
                m.Post("/orgs", reqToken(), bind(api.CreateOrgOption{}), org.Create)
-               m.Group("/orgs/:orgname", func() {
+               m.Group("/orgs/:org", func() {
                        m.Get("/repos", user.ListOrgRepos)
                        m.Combo("").Get(org.Get).
                                Patch(reqToken(), reqOrgOwnership(), bind(api.EditOrgOption{}), org.Edit).
@@ -850,7 +850,7 @@ func RegisterRoutes(m *macaron.Macaron) {
                        })
                        m.Group("/repos", func() {
                                m.Get("", org.GetTeamRepos)
-                               m.Combo("/:orgname/:reponame").
+                               m.Combo("/:org/:reponame").
                                        Put(org.AddTeamRepository).
                                        Delete(org.RemoveTeamRepository)
                        })