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

"fixed not displayed customfields in 1.4 calendar csv import"

Browse Source
This commit is contained in:
Ralf Becker 2008-07-08 12:16:58 +00:00
parent 9e18fccb99
commit 2f28409738
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/csv_import.php
View File

@ -106,7 +106,7 @@
if (is_numeric($cat) && $GLOBALS['egw']->categories->id2name($cat) != '--') if (is_numeric($cat) && $GLOBALS['egw']->categories->id2name($cat) != '--')
{ {
$cat2id[$cat] = $ids[$cat] = $cat; $cat2id[$cat] = $ids[$cat] = $cat;
} }
elseif ($id = $GLOBALS['egw']->categories->name2id( addslashes($cat) )) elseif ($id = $GLOBALS['egw']->categories->name2id( addslashes($cat) ))
{ // cat exists { // cat exists
$cat2id[$cat] = $ids[$cat] = $id; $cat2id[$cat] = $ids[$cat] = $id;
@ -182,7 +182,8 @@
$custom_fields = $config->read_repository(); $custom_fields = $config->read_repository();
unset($config); unset($config);
//echo "custom-fields=<pre>".print_r($custom_fields,True)."</pre>"; //echo "custom-fields=<pre>".print_r($custom_fields,True)."</pre>";
foreach ($custom_fields as $name => $data) if (is_array($custom_fields['customfields']))
foreach ($custom_fields['customfields'] as $name => $data)
{ {
$cal_names['#'.$name] = $data['label'].': Custom field ('.$data['type'].')'; $cal_names['#'.$name] = $data['label'].': Custom field ('.$data['type'].')';
} }
@ -481,7 +482,7 @@
$action = $values['id'] ? 'updating' : 'adding'; $action = $values['id'] ? 'updating' : 'adding';
//echo $action.'<pre>'.print_r($values,True)."</pre>\n"; //echo $action.'<pre>'.print_r($values,True)."</pre>\n";
$cal_id = $cal->bo->update($values,true,!$values['modified'],$is_admin); // ignoring conflicts and ACL (for admins) on import $cal_id = $cal->bo->update($values,true,!$values['modified'],$is_admin); // ignoring conflicts and ACL (for admins) on import
$log .= "\t\t".'<td align="center">'.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."</td>\n\t</tr>\n"; $log .= "\t\t".'<td align="center">'.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."</td>\n\t</tr>\n";
} }
else else