Browse Source

Prevent deadlock in create issue (#17970) (#17982)

tags/v1.15.8
zeripath 4 years ago committed by GitHub
parent
commit
fc8c23edb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      models/repo_issue.go

7
models/repo_issue.go

@ -21,13 +21,18 @@ func (repo *Repository) CanEnableTimetracker() bool {
// IsTimetrackerEnabled returns whether or not the timetracker is enabled. It returns the default value from config if an error occurs. // IsTimetrackerEnabled returns whether or not the timetracker is enabled. It returns the default value from config if an error occurs.
func (repo *Repository) IsTimetrackerEnabled() bool { func (repo *Repository) IsTimetrackerEnabled() bool {
return repo.isTimetrackerEnabled(x)
}
// IsTimetrackerEnabled returns whether or not the timetracker is enabled. It returns the default value from config if an error occurs.
func (repo *Repository) isTimetrackerEnabled(e Engine) bool {
if !setting.Service.EnableTimetracking { if !setting.Service.EnableTimetracking {
return false return false
} }
var u *RepoUnit var u *RepoUnit
var err error var err error
if u, err = repo.GetUnit(UnitTypeIssues); err != nil { if u, err = repo.getUnit(e, UnitTypeIssues); err != nil {
return setting.Service.DefaultEnableTimetracking return setting.Service.DefaultEnableTimetracking
} }
return u.IssuesConfig().EnableTimetracker return u.IssuesConfig().EnableTimetracker

Loading…
Cancel
Save