Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-20 05:39:42 +02:00
Code Releases Activity

Ensure activity view works on UTC date formats

Browse source
This commit is contained in:
McMatts 2018-04-26 13:44:29 +01:00
parent b40db1433e
commit f2a903d054
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gui/app/helpers/formatted-date.js
View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved. // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
// //
// This software (Documize Community Edition) is licensed under // This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
// //
// You can operate outside the AGPL restrictions by purchasing // You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license // Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>. // by contacting <sales@documize.com>.
// //
// https://documize.com // https://documize.com
@ -15,7 +15,9 @@ export function formattedDate(params) {
let format = params[1]; let format = params[1];
if (is.undefined(format)) format = 'Do MMMM YYYY, HH:mm'; if (is.undefined(format)) format = 'Do MMMM YYYY, HH:mm';
return moment(params[0]).format(format); return moment(params[0]).utc().format(format);
// return moment(params[0]).format(format);
// return moment(params[0]).local().format(format);
} }
export default helper(formattedDate); export default helper(formattedDate);

8
gui/app/utils/date.js
View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved. // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
// //
// This software (Documize Community Edition) is licensed under // This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
// //
// You can operate outside the AGPL restrictions by purchasing // You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license // Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>. // by contacting <sales@documize.com>.
// //
// https://documize.com // https://documize.com
@ -24,7 +24,7 @@ function formatDate(date, format) {
} }
function timeAgo(date) { function timeAgo(date) {
return moment(new Date(date)).fromNow(); return moment(new Date(date)).local().fromNow();
} }
function timeAgoUTC(date) { function timeAgoUTC(date) {
@ -37,4 +37,4 @@ export default {
formatDate, formatDate,
timeAgo, timeAgo,
timeAgoUTC timeAgoUTC
}; };