extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some customfields not getting pre-processed or losing value

Browse Source
This commit is contained in:
Nathan Gray 2013-06-18 23:26:43 +00:00
parent c952141839
commit 9bfdbfccaf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/inc/class.etemplate_widget_customfields.inc.php
View File

@ -211,17 +211,18 @@ class etemplate_widget_customfields extends etemplate_widget_transformer
$field_settings = array(); $field_settings = array();
foreach($fields as $fname => $field) foreach($fields as $fname => $field)
{ {
if($field['type'] == 'date' && self::$request->content[self::$prefix.$fname]) if($field['type'] == 'date' && ($d_val = self::$request->content[self::$prefix.$fname]) && !is_numeric($d_val))
{ {
self::$request->content[self::$prefix.$fname] = strtotime(self::$request->content[self::$prefix.$fname]); self::$request->content[self::$prefix.$fname] = strtotime($d_val);
} }
// Run beforeSendToClient for each field // Run beforeSendToClient for each field
$widget = self::factory($field['type'], '<?xml version="1.0"?><'.$field['type'].' type="'.$field['type'].'"/>', self::$prefix.$fname); $widget = self::factory($field['type'], '<'.$field['type'].' type="'.$field['type'].'" id="'.self::$prefix.$fname.'"/>', self::$prefix.$fname);
if(method_exists($widget, 'beforeSendToClient')) if(method_exists($widget, 'beforeSendToClient'))
{ {
$widget->id = "customfields[{$fname}]"; $widget->id = self::$prefix.$fname;
$widget->beforeSendToClient($this->id, $fname); $widget->attrs['type'] = $field['type'];
$widget->beforeSendToClient($this->id == self::GLOBAL_ID ? '':$this->id, $fname);
} }
} }
} }