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

diff --git a/routers/private/serv.go b/routers/private/serv.go
index eba431785b94fa4c0179ddecfef844edd3e52887..b6dd2c361e012faedb7904fcc0c81873a5581f6c 100644 (file)
--- a/routers/private/serv.go
+++ b/routers/private/serv.go
@@ -114,7 +114,7 @@ func ServCommand(ctx *macaron.Context) {
                })
                return
        }
-       if !owner.IsActive {
+       if !owner.IsOrganization() && !owner.IsActive {
                ctx.JSON(http.StatusForbidden, map[string]interface{}{
                        "results": results,
                        "type":    "ForbiddenError",

diff --git a/routers/repo/http.go b/routers/repo/http.go
index 8cb4827f48fa740acd89956d3f82a9dc31c9f2f2..a1dcd65e1f5a047f2f57ed05e203840473010de6 100644 (file)
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -104,7 +104,7 @@ func HTTP(ctx *context.Context) {
                ctx.NotFoundOrServerError("GetUserByName", models.IsErrUserNotExist, err)
                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.")
                return
        }