diff options
| author | René Schaar <rene@schaar.priv.at> | 2022-02-15 17:50:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 00:50:10 +0800 |
| commit | 609c91665e5e4d6da50af0b2168d6cb46f9d6273 (patch) | |
| tree | 974e777fbd7262162c4f3b237f3688178962e89c /models/issue_tracked_time.go | |
| parent | 2be49dee71af997ed944c177a090aeb3e6d606e8 (diff) | |
| download | gitea-609c91665e5e4d6da50af0b2168d6cb46f9d6273.tar.gz gitea-609c91665e5e4d6da50af0b2168d6cb46f9d6273.zip | |
Fix display time of milestones (#18753)
* Fix display time of milestones
* Move the SecToTime function
From the models/issue_stopwatch.go file to the modules/util package
* Rename the sec_to_time file
* Updated formatting
* Include copyright notice in sec_to_time.go
* Apply PR review suggestions
- Update copyright notice dates to 2022
- Change `1 day 3h 5min 7s` to `1d 3h 5m 7s`
* Rename hrs var and combine conditions
* Update unit tests to match new time pattern
Changed `1min` to `1m`
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'models/issue_tracked_time.go')
| -rw-r--r-- | models/issue_tracked_time.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go index c887baae15..2d7bef19e1 100644 --- a/models/issue_tracked_time.go +++ b/models/issue_tracked_time.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "xorm.io/builder" ) @@ -177,7 +178,7 @@ func AddTime(user *user_model.User, issue *Issue, amount int64, created time.Tim Issue: issue, Repo: issue.Repo, Doer: user, - Content: SecToTime(amount), + Content: util.SecToTime(amount), Type: CommentTypeAddTimeManual, TimeID: t.ID, }); err != nil { @@ -226,7 +227,7 @@ func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]string, } return nil, err } - totalTimes[user] = SecToTime(total) + totalTimes[user] = util.SecToTime(total) } return totalTimes, nil } @@ -260,7 +261,7 @@ func DeleteIssueUserTimes(issue *Issue, user *user_model.User) error { Issue: issue, Repo: issue.Repo, Doer: user, - Content: "- " + SecToTime(removedTime), + Content: "- " + util.SecToTime(removedTime), Type: CommentTypeDeleteTimeManual, }); err != nil { return err @@ -289,7 +290,7 @@ func DeleteTime(t *TrackedTime) error { Issue: t.Issue, Repo: t.Issue.Repo, Doer: t.User, - Content: "- " + SecToTime(t.Time), + Content: "- " + util.SecToTime(t.Time), Type: CommentTypeDeleteTimeManual, }); err != nil { return err |