diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/models/pull.go b/models/pull.go index 31e1af7e8c..984a1b3038 100644 --- a/models/pull.go +++ b/models/pull.go @@ -80,17 +80,14 @@ func (pr *PullRequest) BeforeUpdate() { pr.MergedUnix = pr.Merged.Unix() } -// AfterSet is invoked from XORM after setting the value of a field of this object. +// AfterLoad is invoked from XORM after setting the values of all fields of this object. // Note: don't try to get Issue because will end up recursive querying. -func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) { - switch colName { - case "merged_unix": - if !pr.HasMerged { - return - } - - pr.Merged = time.Unix(pr.MergedUnix, 0).Local() +func (pr *PullRequest) AfterLoad() { + if !pr.HasMerged { + return } + + pr.Merged = time.Unix(pr.MergedUnix, 0).Local() } // Note: don't try to get Issue because will end up recursive querying. |