holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport from Nathans r48344: Fix duration parsed in wrong format if there was no choice for format.

Browse Source
This commit is contained in:
Ralf Becker 2014-08-27 16:32:20 +00:00
parent ee167028e3
commit 1ed8a70a08
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/js/et2_widget_date.js
View File

@ -500,7 +500,7 @@ var et2_date_duration = et2_date.extend(
return this.options.empty_not_0 ? '' : 0;
}
// Put value into minutes for further processing
switch(this.format ? this.format.val() : this.options.display_format)
switch(this.format && this.format.val() ? this.format.val() : this.options.display_format)
{
case 'd':
value *= this.options.hours_per_day;