peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged 'routers/issue_dependency_add' and 'routers/issue_dependency_remove' into one single file

Browse Source
This commit is contained in:
kolaente 2018-02-12 17:22:43 +01:00 committed by Konrad
parent 16b1636043
commit be51a479dc
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 50 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
routers/repo/issue_dependency_add.go → routers/repo/issue_dependency.go
View File

@ -67,3 +67,53 @@ func AddDependency(ctx *context.Context) {
url := fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issueIndex)
ctx.Redirect(url, http.StatusSeeOther)
}
// RemoveDependency removes the dependency
func RemoveDependency(ctx *context.Context) {
depID := ctx.QueryInt64("removeDependencyID")
issueIndex := ctx.ParamsInt64("index")
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, issueIndex)
if err != nil {
ctx.ServerError("GetIssueByIndex", err)
return
}
// Check if the Repo is allowed to have dependencies
if !ctx.Repo.CanCreateIssueDependencies(ctx.User) {
ctx.NotFound("NotAllowedToCreateIssueDependencies", nil)
return
}
// Dependency Type
depTypeStr := ctx.Req.PostForm.Get("dependencyType")
var depType models.DependencyType
switch depTypeStr {
case "blockedBy":
depType = models.DependencyTypeBlockedBy
case "blocking":
depType = models.DependencyTypeBlocking
default:
ctx.Error(http.StatusBadRequest, "GetDependecyType")
//ctx.Handle(http.StatusBadRequest, "GetDependecyType", nil)
return
}
// Dependency
dep, err := models.GetIssueByID(depID)
if err != nil {
ctx.ServerError("GetIssueByID", err)
return
}
if err = models.RemoveIssueDependency(ctx.User, issue, dep, depType); err != nil {
ctx.ServerError("RemoveIssueDependency", err)
return
}
url := fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issueIndex)
ctx.Redirect(url, http.StatusSeeOther)
}

62
routers/repo/issue_dependency_remove.go
View File

@ -1,62 +0,0 @@
// Copyright 2017 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package repo
import (
"fmt"
"net/http"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
)
// RemoveDependency removes the dependency
func RemoveDependency(ctx *context.Context) {
depID := ctx.QueryInt64("removeDependencyID")
issueIndex := ctx.ParamsInt64("index")
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, issueIndex)
if err != nil {
ctx.ServerError("GetIssueByIndex", err)
return
}
// Check if the Repo is allowed to have dependencies
if !ctx.Repo.CanCreateIssueDependencies(ctx.User) {
ctx.NotFound("NotAllowedToCreateIssueDependencies", nil)
return
}
// Dependency Type
depTypeStr := ctx.Req.PostForm.Get("dependencyType")
var depType models.DependencyType
switch depTypeStr {
case "blockedBy":
depType = models.DependencyTypeBlockedBy
case "blocking":
depType = models.DependencyTypeBlocking
default:
ctx.Error(http.StatusBadRequest, "GetDependecyType")
//ctx.Handle(http.StatusBadRequest, "GetDependecyType", nil)
return
}
// Dependency
dep, err := models.GetIssueByID(depID)
if err != nil {
ctx.ServerError("GetIssueByID", err)
return
}
if err = models.RemoveIssueDependency(ctx.User, issue, dep, depType); err != nil {
ctx.ServerError("RemoveIssueDependency", err)
return
}
url := fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issueIndex)
ctx.Redirect(url, http.StatusSeeOther)
}