espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.8.5'

Browse Source
This commit is contained in:
yuri
2017-11-21 10:55:24 +02:00
parent 17cef2461d 0797b71d95
commit b8e526757a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/date-time.js
+3 -7
View File
@@ -149,11 +149,7 @@ Espo.define('date-time', [], function () {
},
getNowMoment: function () {
var m = moment();
if (this.timeZone) {
m = m.tz(this.timeZone);
}
return m;
return moment().tz(this.getTimeZone())
},
toMomentDate: function (string) {
@@ -185,7 +181,7 @@ Espo.define('date-time', [], function () {
},
getToday: function () {
return moment().tz(this.timeZone).format(this.internalDateFormat);
return moment().tz(this.getTimeZone()).format(this.internalDateFormat);
},
getDateTimeShiftedFromNow: function (shift, type, multiplicity) {
@@ -199,7 +195,7 @@ Espo.define('date-time', [], function () {
},
getDateShiftedFromToday: function (shift, type) {
return moment.tz(this.timeZone).add(type, shift).format(this.internalDateFormat);
return moment.tz(this.getTimeZone()).add(type, shift).format(this.internalDateFormat);
},
getNow: function (multiplicity) {