Browse Source

Fix a bug when check if owner is active (#13612)

tags/v1.15.0-dev
Lunny Xiao 4 years ago committed by GitHub
parent
commit
5a991ec519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      routers/private/serv.go
  2. 2
      routers/repo/http.go

2
routers/private/serv.go

@ -114,7 +114,7 @@ func ServCommand(ctx *macaron.Context) {
}) })
return return
} }
if !owner.IsActive { if !owner.IsOrganization() && !owner.IsActive {
ctx.JSON(http.StatusForbidden, map[string]interface{}{ ctx.JSON(http.StatusForbidden, map[string]interface{}{
"results": results, "results": results,
"type": "ForbiddenError", "type": "ForbiddenError",

2
routers/repo/http.go

@ -105,7 +105,7 @@ func HTTP(ctx *context.Context) {
ctx.NotFoundOrServerError("GetUserByName", models.IsErrUserNotExist, err) ctx.NotFoundOrServerError("GetUserByName", models.IsErrUserNotExist, err)
return return
} }
if !owner.IsActive { if !owner.IsOrganization() && !owner.IsActive {
ctx.HandleText(http.StatusForbidden, "Repository cannot be accessed. You cannot push or open issues/pull-requests.") ctx.HandleText(http.StatusForbidden, "Repository cannot be accessed. You cannot push or open issues/pull-requests.")
return return
} }

Loading…
Cancel
Save