[eGroupWare-svn] r48349 - /branches/14.1/etemplate/js/et2_widget_date.js

[<ral...@us...>]

Author: ralfbecker
Date: Wed Aug 27 18:32:20 2014
New Revision: 48349

URL: http://svn.stylite.de/viewvc/egroupware?rev=48349&view=rev
Log:
backport from Nathans r48344: Fix duration parsed in wrong format if there was no choice for format.

Modified:
    branches/14.1/etemplate/js/et2_widget_date.js

Modified: branches/14.1/etemplate/js/et2_widget_date.js
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/etemplate/js/et2_widget_date.js?rev=48349&r1=48348&r2=48349&view=diff
==============================================================================
--- branches/14.1/etemplate/js/et2_widget_date.js (original)
+++ branches/14.1/etemplate/js/et2_widget_date.js Wed Aug 27 18:32:20 2014
@@ -500,7 +500,7 @@
 			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;