diff options
| author | Norwin <noerw@users.noreply.github.com> | 2021-01-21 14:51:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 15:51:52 +0100 |
| commit | b5570d3e680570343c1552bfc972b19b161209cd (patch) | |
| tree | 548fbcdb9a760b47c54ac931c0180d87d08029d5 /modules | |
| parent | 56a89296050096df29d0a653019c194631cc6562 (diff) | |
| download | gitea-b5570d3e680570343c1552bfc972b19b161209cd.tar.gz gitea-b5570d3e680570343c1552bfc972b19b161209cd.zip | |
Display current stopwatch in navbar (#14122)
* add notification about running stopwatch to header
* serialize seconds, duration in stopwatches api
* ajax update stopwatch
i should get my testenv working locally...
* new variant: hover dialog
* noscript compatibility
* js: live-update stopwatch time
* js live update robustness
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/convert/issue.go | 2 | ||||
| -rw-r--r-- | modules/structs/issue_stopwatch.go | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/modules/convert/issue.go b/modules/convert/issue.go index 36446da2d1..b773e78a6b 100644 --- a/modules/convert/issue.go +++ b/modules/convert/issue.go @@ -147,6 +147,8 @@ func ToStopWatches(sws []*models.Stopwatch) (api.StopWatches, error) { result = append(result, api.StopWatch{ Created: sw.CreatedUnix.AsTime(), + Seconds: sw.Seconds(), + Duration: sw.Duration(), IssueIndex: issue.Index, IssueTitle: issue.Title, RepoOwnerName: repo.OwnerName, diff --git a/modules/structs/issue_stopwatch.go b/modules/structs/issue_stopwatch.go index 8599e07273..15d17cdda7 100644 --- a/modules/structs/issue_stopwatch.go +++ b/modules/structs/issue_stopwatch.go @@ -12,6 +12,8 @@ import ( type StopWatch struct { // swagger:strfmt date-time Created time.Time `json:"created"` + Seconds int64 `json:"seconds"` + Duration string `json:"duration"` IssueIndex int64 `json:"issue_index"` IssueTitle string `json:"issue_title"` RepoOwnerName string `json:"repo_owner_name"` |