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

More consitency when defining returned variables

Browse Source
This commit is contained in:
kolaente 2018-04-14 13:54:04 +02:00
parent 6f999a03e0
commit 7528664a97
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
models/issue.go
View File

@ -1514,9 +1514,7 @@ func UpdateIssue(issue *Issue) error {
}
// Get Blocked By Dependencies, aka all issues this issue is blocked by.
func (issue *Issue) getBlockedByDependencies(e Engine) (_ []*Issue, err error) {
var issueDeps []*Issue
func (issue *Issue) getBlockedByDependencies(e Engine) (issueDeps []*Issue, err error) {
if err = e.
Table("issue_dependency").
Select("issue.*").
@ -1526,13 +1524,11 @@ func (issue *Issue) getBlockedByDependencies(e Engine) (_ []*Issue, err error) {
return issueDeps, err
}
return issueDeps, nil
return
}
// Get Blocking Dependencies, aka all issues this issue blocks.
func (issue *Issue) getBlockingDependencies(e Engine) ([]*Issue, error) {
var issueDeps []*Issue
func (issue *Issue) getBlockingDependencies(e Engine) (issueDeps []*Issue, err error) {
if err := e.
Table("issue_dependency").
Select("issue.*").
@ -1542,15 +1538,15 @@ func (issue *Issue) getBlockingDependencies(e Engine) ([]*Issue, error) {
return issueDeps, err
}
return issueDeps, nil
return
}
// BlockedByDependencies finds all Dependencies an issue is blocked by
func (issue *Issue) BlockedByDependencies() (_ []*Issue, err error) {
func (issue *Issue) BlockedByDependencies() ([]*Issue, error) {
return issue.getBlockedByDependencies(x)
}
// BlockingDependencies returns all blocking dependencies, aka all other issues a given issue blocks
func (issue *Issue) BlockingDependencies() (_ []*Issue, err error) {
func (issue *Issue) BlockingDependencies() ([]*Issue, error) {
return issue.getBlockingDependencies(x)
}

5
models/issue_comment.go
View File

@ -273,15 +273,14 @@ func (c *Comment) LoadAssignees() error {
}
// LoadDepIssueDetails loads Dependent Issue Details
func (c *Comment) LoadDepIssueDetails() error {
var err error
func (c *Comment) LoadDepIssueDetails() (err error) {
if c.DependentIssueID > 0 && c.DependentIssue == nil {
c.DependentIssue, err = getIssueByID(x, c.DependentIssueID)
if err != nil {
return err
}
}
return nil
return
}
// MailParticipants sends new comment emails to repository watchers

4
models/issue_dependency.go
View File

@ -33,7 +33,7 @@ const (
func CreateIssueDependency(user *User, issue, dep *Issue) (err error) {
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
if err = sess.Begin(); err != nil {
return err
}
@ -71,7 +71,7 @@ func CreateIssueDependency(user *User, issue, dep *Issue) (err error) {
func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType DependencyType) (err error) {
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
if err = sess.Begin(); err != nil {
return err
}