MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 05:12:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
fixes #14435
This commit is contained in:
Norwin 2021-02-19 23:06:56 +00:00 committed by GitHub
parent aa4f9180e4
commit 91424fff3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/templates/helper.go
View file

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

1
templates/base/head.tmpl
View file

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

7
web_src/js/features/stopwatch.js
View file

@ -1,11 +1,14 @@
import prettyMilliseconds from 'pretty-ms'; 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 let updateTimeInterval = null; // holds setInterval id when active
export async function initStopwatch() { 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.removeAttr('href'); // intended for noscript mode only
stopwatchEl.popup({ stopwatchEl.popup({
position: 'bottom right', position: 'bottom right',