Browse Source

stopwatch notif: check if timetracking is enabled (#14750)

fixes #14435
tags/v1.15.0-dev
Norwin GitHub 4 years ago
parent
commit
0b32daafec
3 changed files with 9 additions and 2 deletions
  1. +3
    -0
      modules/templates/helper.go
  2. +1
    -0
      templates/base/head.tmpl
  3. +5
    -2
      web_src/js/features/stopwatch.js

+ 3
- 0
modules/templates/helper.go View File

@@ -174,6 +174,9 @@ func NewFuncMap() []template.FuncMap {
"UseServiceWorker": func() bool {
return setting.UI.UseServiceWorker
},
"EnableTimetracking": func() bool {
return setting.Service.EnableTimetracking
},
"FilenameIsImage": func(filename string) bool {
mimeType := mime.TypeByExtension(filepath.Ext(filename))
return strings.HasPrefix(mimeType, "image/")


+ 1
- 0
templates/base/head.tmpl View File

@@ -42,6 +42,7 @@
MaxTimeout: {{NotificationSettings.MaxTimeout}},
EventSourceUpdateTime: {{NotificationSettings.EventSourceUpdateTime}},
},
EnableTimetracking: {{if EnableTimetracking}}true{{else}}false{{end}},
PageIsProjects: {{if .PageIsProjects }}true{{else}}false{{end}},
{{if .RequireTribute}}
tributeValues: Array.from(new Map([


+ 5
- 2
web_src/js/features/stopwatch.js View File

@@ -1,11 +1,14 @@
import prettyMilliseconds from 'pretty-ms';
const {AppSubUrl, csrf, NotificationSettings} = window.config;
const {AppSubUrl, csrf, NotificationSettings, EnableTimetracking} = window.config;

let updateTimeInterval = null; // holds setInterval id when active

export async function initStopwatch() {
const stopwatchEl = $('.active-stopwatch-trigger');
if (!EnableTimetracking) {
return;
}

const stopwatchEl = $('.active-stopwatch-trigger');
stopwatchEl.removeAttr('href'); // intended for noscript mode only
stopwatchEl.popup({
position: 'bottom right',


Loading…
Cancel
Save