extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-20 12:58:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Etemplate - timestamper widget now supports timezone attribute to force a certain timezone

Browse Source
This commit is contained in:
nathangray 2018-07-27 13:31:02 -06:00
parent 7ed5c42b3d
commit dca3c1ec30
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/js/etemplate/et2_widget_timestamper.js
View File

@ -36,6 +36,12 @@ var et2_timestamper = (function(){ "use strict"; return et2_button.extend([],
default: et2_no_init, default: et2_no_init,
description: "Format for the timestamp. User is always after." description: "Format for the timestamp. User is always after."
}, },
timezone: {
name: "Timezone",
type: "string",
default: et2_no_init,
description: "Timezone. Default is user time."
},
image: { image: {
default: "timestamp" default: "timestamp"
}, },
@ -70,7 +76,9 @@ var et2_timestamper = (function(){ "use strict"; return et2_button.extend([],
_insert_text: function() { _insert_text: function() {
var text = ""; var text = "";
var now = new Date(); var now = new Date(new Date().toLocaleString('en-US', {
timeZone: this.options.timezone ? this.options.timezone : egw.preference('tz')
}));
var format = (this.options.format ? var format = (this.options.format ?
this.options.format : this.options.format :
egw.preference('dateformat') + ' ' + (egw.preference("timeformat") === "12" ? "h:ia" : "H:i"))+' '; egw.preference('dateformat') + ' ' + (egw.preference("timeformat") === "12" ? "h:ia" : "H:i"))+' ';