Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correctly set the organization num repos #11339

Merged
merged 9 commits into from
May 11, 2020
Merged

Correctly set the organization num repos #11339

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5414c1b
Correctly set the organization num repos
zeripath May 8, 2020
70ad0be
as per @lunny
zeripath May 8, 2020
1a0f66d
attempt to fix mssql
zeripath May 8, 2020
2ffb17f
Update models/user.go
zeripath May 8, 2020
3293c39
Explicit columns
zeripath May 8, 2020
6433889
Merge remote-tracking branch 'origin/master' into fix-11194-fix-organ…
zeripath May 10, 2020
5aa1a58
Merge remote-tracking branch 'origin/master' into fix-11194-fix-organ…
zeripath May 11, 2020
db46f17
Add test and fix 0 counted orgs
zeripath May 11, 2020
0af8b35
remove orgname from api
zeripath May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
remove orgname from api 
Signed-off-by: Andrew Thornton <[email protected]>
  • Loading branch information
@zeripath
zeripath committed May 11, 2020
commit 0af8b3592621688bcc363a2b07aacaaf58774c48
6 changes: 3 additions & 3 deletions routers/api/v1/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,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()
Expand Down Expand Up @@ -857,7 +857,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/users/:username/orgs", org.ListUserOrgs)
m.Post("/orgs", reqToken(), bind(api.CreateOrgOption{}), org.Create)
m.Get("/orgs", org.GetAll)
m.Group("/orgs/:orgname", func() {
m.Group("/orgs/:org", func() {
m.Combo("").Get(org.Get).
Patch(reqToken(), reqOrgOwnership(), bind(api.EditOrgOption{}), org.Edit).
Delete(reqToken(), reqOrgOwnership(), org.Delete)
Expand Down Expand Up @@ -907,7 +907,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)
})
Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) {
// "403":
// "$ref": "#/responses/forbidden"

org, err := models.GetOrgByName(ctx.Params(":orgname"))
org, err := models.GetOrgByName(ctx.Params(":org"))
if err != nil {
if models.IsErrOrgNotExist(err) {
ctx.Error(http.StatusUnprocessableEntity, "", err)
Expand Down