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

Improved readability

Browse Source
This commit is contained in:
Konrad Langenberg 2017-11-01 21:33:42 +01:00 committed by Konrad
parent 993a3c0b86
commit 3beecd2d13
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
4 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
models/issue_dependency.go
View File

@ -52,16 +52,12 @@ func CreateIssueDependency(user *User, issue, dep *Issue) (exists bool, err erro
} }
// Add comment referencing the new dependency // Add comment referencing the new dependency
_, err = createIssueDependencyComment(sess, user, issue, dep, true) if _, err = createIssueDependencyComment(sess, user, issue, dep, true); err != nil {
if err != nil {
return exists, err return exists, err
} }
// Create a new comment for the dependent issue // Create a new comment for the dependent issue
_, err = createIssueDependencyComment(sess, user, dep, issue, true) if _, err = createIssueDependencyComment(sess, user, dep, issue, true); err != nil {
if err != nil {
return exists, err return exists, err
} }
} }
@ -73,8 +69,8 @@ func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType Depende
sess := x.NewSession() sess := x.NewSession()
// Check if it exists // Check if it exists
exists, err := issueDepExists(x, issue.ID, dep.ID) var exists bool
if err != nil { if exists, err = issueDepExists(x, issue.ID, dep.ID); err != nil {
return err return err
} }
@ -92,22 +88,17 @@ func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType Depende
return return
} }
_, err := x.Delete(&issueDepToDelete) if _, err := x.Delete(&issueDepToDelete); err != nil {
if err != nil {
return err return err
} }
// Add comment referencing the removed dependency // Add comment referencing the removed dependency
_, err = createIssueDependencyComment(sess, user, issue, dep, false) if _, err = createIssueDependencyComment(sess, user, issue, dep, false); err != nil {
if err != nil {
return err return err
} }
// Create a new comment for the dependent issue // Create a new comment for the dependent issue
_, err = createIssueDependencyComment(sess, user, dep, issue, false) if _, err = createIssueDependencyComment(sess, user, dep, issue, false); err != nil {
if err != nil {
return err return err
} }
} }
@ -119,11 +110,7 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro
exists, err = e.Where("(issue_id = ? AND dependency_id = ?) OR (issue_id = ? AND dependency_id = ?)", issueID, depID, depID, issueID).Exist(&IssueDependency{}) exists, err = e.Where("(issue_id = ? AND dependency_id = ?) OR (issue_id = ? AND dependency_id = ?)", issueID, depID, depID, issueID).Exist(&IssueDependency{})
if err != nil { return
return exists, err
}
return exists, nil
} }
// IssueDependencyIssue custom type for mysql join // IssueDependencyIssue custom type for mysql join

4
models/migrations/v49.go
View File

@ -24,9 +24,7 @@ func addIssueDependencyTables(x *xorm.Engine) (err error) {
UpdatedUnix int64 `xorm:"updated"` UpdatedUnix int64 `xorm:"updated"`
} }
err = x.Sync(new(IssueDependency)) if err = x.Sync(new(IssueDependency)); err != nil {
if err != nil {
return fmt.Errorf("Error creating issue_dependency_table column definition: %v", err) return fmt.Errorf("Error creating issue_dependency_table column definition: %v", err)
} }

8
models/repo.go
View File

@ -2457,8 +2457,7 @@ func (repo *Repository) GetUserFork(userID int64) (*Repository, error) {
func (repo *Repository) getBlockedByDependencies(e Engine, issueID int64) (_ []*IssueDependencyIssue, err error) { func (repo *Repository) getBlockedByDependencies(e Engine, issueID int64) (_ []*IssueDependencyIssue, err error) {
var issueDeps []*IssueDependencyIssue var issueDeps []*IssueDependencyIssue
err = x.Join("INNER", "issue", "issue.id = issue_dependency.dependency_id").Where("issue_id = ?", issueID).Find(&issueDeps) if err = x.Join("INNER", "issue", "issue.id = issue_dependency.dependency_id").Where("issue_id = ?", issueID).Find(&issueDeps); err != nil {
if err != nil {
return issueDeps, err return issueDeps, err
} }
@ -2466,11 +2465,10 @@ func (repo *Repository) getBlockedByDependencies(e Engine, issueID int64) (_ []*
} }
// Get Blocking Dependencies, aka all issues this issue blocks. // Get Blocking Dependencies, aka all issues this issue blocks.
func (repo *Repository) getBlockingDependencies(e Engine, issueID int64) (_ []*IssueDependencyIssue, err error) { func (repo *Repository) getBlockingDependencies(e Engine, issueID int64) ([]*IssueDependencyIssue, error) {
var issueDeps []*IssueDependencyIssue var issueDeps []*IssueDependencyIssue
err = x.Join("INNER", "issue", "issue.id = issue_dependency.issue_id").Where("dependency_id = ?", issueID).Find(&issueDeps) if err := x.Join("INNER", "issue", "issue.id = issue_dependency.issue_id").Where("dependency_id = ?", issueID).Find(&issueDeps); err != nil {
if err != nil {
return issueDeps, err return issueDeps, err
} }

2
routers/repo/issue_dependency_add.go
View File

@ -16,8 +16,6 @@ import (
// AddDependency adds new dependencies // AddDependency adds new dependencies
func AddDependency(c *context.Context) { func AddDependency(c *context.Context) {
// TODO: should should an issue only have dependencies in it's own repo?
depID, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64) depID, err := strconv.ParseInt(c.Req.PostForm.Get("newDependency"), 10, 64)
if err != nil { if err != nil {
c.Handle(http.StatusBadRequest, "issue ID is not int", err) c.Handle(http.StatusBadRequest, "issue ID is not int", err)