mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	Move organization related structs into sub package (#18518)
* Move organization related structs into sub package * Fix test * Fix lint * Move more functions into sub packages * Fix bug * Fix test * Update models/organization/team_repo.go Co-authored-by: KN4CK3R <admin@oldschoolhack.me> * Apply suggestions from code review Co-authored-by: KN4CK3R <admin@oldschoolhack.me> * Fix fmt * Follow suggestion from @Gusted * Fix test * Fix test * Fix bug * Use ctx but db.DefaultContext on routers * Fix bug * Fix bug * fix bug * Update models/organization/team_user.go * Fix bug Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -13,6 +13,7 @@ import ( | ||||
|  | ||||
| 	"code.gitea.io/gitea/models" | ||||
| 	"code.gitea.io/gitea/models/db" | ||||
| 	"code.gitea.io/gitea/models/organization" | ||||
| 	"code.gitea.io/gitea/models/perm" | ||||
| 	repo_model "code.gitea.io/gitea/models/repo" | ||||
| 	unit_model "code.gitea.io/gitea/models/unit" | ||||
| @@ -398,7 +399,7 @@ func Generate(ctx *context.APIContext) { | ||||
| 		} | ||||
|  | ||||
| 		if !ctx.Doer.IsAdmin { | ||||
| 			canCreate, err := models.OrgFromUser(ctxUser).CanCreateOrgRepo(ctx.Doer.ID) | ||||
| 			canCreate, err := organization.OrgFromUser(ctxUser).CanCreateOrgRepo(ctx.Doer.ID) | ||||
| 			if err != nil { | ||||
| 				ctx.ServerError("CanCreateOrgRepo", err) | ||||
| 				return | ||||
| @@ -484,9 +485,9 @@ func CreateOrgRepo(ctx *context.APIContext) { | ||||
| 	//   "403": | ||||
| 	//     "$ref": "#/responses/forbidden" | ||||
| 	opt := web.GetForm(ctx).(*api.CreateRepoOption) | ||||
| 	org, err := models.GetOrgByName(ctx.Params(":org")) | ||||
| 	org, err := organization.GetOrgByName(ctx.Params(":org")) | ||||
| 	if err != nil { | ||||
| 		if models.IsErrOrgNotExist(err) { | ||||
| 		if organization.IsErrOrgNotExist(err) { | ||||
| 			ctx.Error(http.StatusUnprocessableEntity, "", err) | ||||
| 		} else { | ||||
| 			ctx.Error(http.StatusInternalServerError, "GetOrgByName", err) | ||||
| @@ -494,7 +495,7 @@ func CreateOrgRepo(ctx *context.APIContext) { | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	if !models.HasOrgOrUserVisible(org.AsUser(), ctx.Doer) { | ||||
| 	if !organization.HasOrgOrUserVisible(ctx, org.AsUser(), ctx.Doer) { | ||||
| 		ctx.NotFound("HasOrgOrUserVisible", nil) | ||||
| 		return | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user