mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	Move issues related files into models/issues (#19931)
* Move access and repo permission to models/perm/access * fix test * fix git test * Move functions sequence * Some improvements per @KN4CK3R and @delvh * Move issues related code to models/issues * Move some issues related sub package * Merge * Fix test * Fix test * Fix test * Fix test * Rename some files
This commit is contained in:
		| @@ -7,7 +7,7 @@ package repo | ||||
| import ( | ||||
| 	"net/http" | ||||
|  | ||||
| 	"code.gitea.io/gitea/models" | ||||
| 	issues_model "code.gitea.io/gitea/models/issues" | ||||
| 	"code.gitea.io/gitea/modules/context" | ||||
| 	"code.gitea.io/gitea/modules/setting" | ||||
| ) | ||||
| @@ -15,7 +15,7 @@ import ( | ||||
| // AddDependency adds new dependencies | ||||
| func AddDependency(ctx *context.Context) { | ||||
| 	issueIndex := ctx.ParamsInt64("index") | ||||
| 	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, issueIndex) | ||||
| 	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, issueIndex) | ||||
| 	if err != nil { | ||||
| 		ctx.ServerError("GetIssueByIndex", err) | ||||
| 		return | ||||
| @@ -38,7 +38,7 @@ func AddDependency(ctx *context.Context) { | ||||
| 	defer ctx.Redirect(issue.HTMLURL()) | ||||
|  | ||||
| 	// Dependency | ||||
| 	dep, err := models.GetIssueByID(depID) | ||||
| 	dep, err := issues_model.GetIssueByID(ctx, depID) | ||||
| 	if err != nil { | ||||
| 		ctx.Flash.Error(ctx.Tr("repo.issues.dependency.add_error_dep_issue_not_exist")) | ||||
| 		return | ||||
| @@ -56,12 +56,12 @@ func AddDependency(ctx *context.Context) { | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	err = models.CreateIssueDependency(ctx.Doer, issue, dep) | ||||
| 	err = issues_model.CreateIssueDependency(ctx.Doer, issue, dep) | ||||
| 	if err != nil { | ||||
| 		if models.IsErrDependencyExists(err) { | ||||
| 		if issues_model.IsErrDependencyExists(err) { | ||||
| 			ctx.Flash.Error(ctx.Tr("repo.issues.dependency.add_error_dep_exists")) | ||||
| 			return | ||||
| 		} else if models.IsErrCircularDependency(err) { | ||||
| 		} else if issues_model.IsErrCircularDependency(err) { | ||||
| 			ctx.Flash.Error(ctx.Tr("repo.issues.dependency.add_error_cannot_create_circular")) | ||||
| 			return | ||||
| 		} else { | ||||
| @@ -74,7 +74,7 @@ func AddDependency(ctx *context.Context) { | ||||
| // RemoveDependency removes the dependency | ||||
| func RemoveDependency(ctx *context.Context) { | ||||
| 	issueIndex := ctx.ParamsInt64("index") | ||||
| 	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, issueIndex) | ||||
| 	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, issueIndex) | ||||
| 	if err != nil { | ||||
| 		ctx.ServerError("GetIssueByIndex", err) | ||||
| 		return | ||||
| @@ -96,27 +96,27 @@ func RemoveDependency(ctx *context.Context) { | ||||
| 	// Dependency Type | ||||
| 	depTypeStr := ctx.Req.PostForm.Get("dependencyType") | ||||
|  | ||||
| 	var depType models.DependencyType | ||||
| 	var depType issues_model.DependencyType | ||||
|  | ||||
| 	switch depTypeStr { | ||||
| 	case "blockedBy": | ||||
| 		depType = models.DependencyTypeBlockedBy | ||||
| 		depType = issues_model.DependencyTypeBlockedBy | ||||
| 	case "blocking": | ||||
| 		depType = models.DependencyTypeBlocking | ||||
| 		depType = issues_model.DependencyTypeBlocking | ||||
| 	default: | ||||
| 		ctx.Error(http.StatusBadRequest, "GetDependecyType") | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	// Dependency | ||||
| 	dep, err := models.GetIssueByID(depID) | ||||
| 	dep, err := issues_model.GetIssueByID(ctx, depID) | ||||
| 	if err != nil { | ||||
| 		ctx.ServerError("GetIssueByID", err) | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	if err = models.RemoveIssueDependency(ctx.Doer, issue, dep, depType); err != nil { | ||||
| 		if models.IsErrDependencyNotExists(err) { | ||||
| 	if err = issues_model.RemoveIssueDependency(ctx.Doer, issue, dep, depType); err != nil { | ||||
| 		if issues_model.IsErrDependencyNotExists(err) { | ||||
| 			ctx.Flash.Error(ctx.Tr("repo.issues.dependency.add_error_dep_not_exist")) | ||||
| 			return | ||||
| 		} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user