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

* eTemplate2/all apps: fixed not displayed readonly dates outside lists (eg. created/modified dates in dialogs)

Browse Source
This commit is contained in:
Ralf Becker 2014-09-08 11:38:23 +00:00
parent 6992005c6a
commit 7cafc2fd9c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/js/et2_widget_date.js
View File

@ -735,7 +735,7 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM],
*/
attributes: {
"value": {
"type": "integer"
"type": "string"
},
"type": {
"ignore": false
@ -781,7 +781,12 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM],
return;
}
if(typeof _value == 'string' && isNaN(_value))
if(typeof _value == 'string' && _value.match(/(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})(?:\.\d{3})?(?:Z|[+-](\d{2})\:(\d{2}))/))
{
this.date = new Date(_value);
this.date = new Date(this.date.valueOf() + (this.date.getTimezoneOffset()*60*1000))
}
else if(typeof _value == 'string' && isNaN(_value))
{
// parseDateTime to handle string PHP: DateTime local date/time format
var parsed = (typeof jQuery.datepicker.parseDateTime("yy-mm-dd","hh:mm:ss", _value) !='undefined')?