extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 07:49:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes from John Trudel to allow the ajax select widget to return additional information about a selected item. Additional fields are semicolon separated and added after the primary key in the ID Field

Browse Source
This commit is contained in:
Nathan Gray 2009-09-21 18:34:14 +00:00
parent cdd5ba5dc2
commit 84e61f3d92
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
etemplate/inc/class.ajax_select_widget.inc.php
View File

@ -249,8 +249,20 @@ class ajax_select_widget
echo 'Looping...<br />Returning ' . $return . '<br />'; echo 'Looping...<br />Returning ' . $return . '<br />';
} }
return $return; return $return;
} else {
if (stripos($extension_data['options']['id_field'], ";")) {
$expected_fields = array_flip(explode(";", $extension_data['options']['id_field']));
$fields_n_values = explode(";", $value_in['value']);
foreach ($fields_n_values as $field_n_value) {
list($myfield, $myvalue) = explode(":", $field_n_value);
if (array_key_exists($myfield, $expected_fields)) {
$value_in[$myfield] = $myvalue;
}
}
$value = $value_in;
} else { } else {
$value = $value_in['value']; $value = $value_in['value'];
}
return true; return true;
} }
} }
@ -303,19 +315,38 @@ class ajax_select_widget
if(!is_array($row)) { if(!is_array($row)) {
continue; continue;
} }
//check for multiple id's
//this if control statement is to determine if there are multiple ids in the ID FIELD of the Ajax Widget
if(stristr($query['id_field'], ';') != FALSE) {
$id_field_keys = explode(';', $query['id_field']);
if($query['get_title']) {
//the title will always be created using the first ID FIELD
if($row[$id_field_keys[0]]) {
$row['title'] = ExecMethod($query['get_title'], $row[$id_field_keys[0]]);
}
}
foreach($id_field_keys as $value) {
$id_field_keys_values[] = $value.':'.$row[$value];
}
$row['id_field'] = implode(';',$id_field_keys_values);
unset($id_field_keys_values);
} else{
if($query['id_field'] && $query['get_title']) { if($query['id_field'] && $query['get_title']) {
if($row[$query['id_field']]) { if($row[$query['id_field']]) {
$row['title'] = ExecMethod($query['get_title'], $row[$query['id_field']]); $row['title'] = ExecMethod($query['get_title'], $row[$query['id_field']]);
} }
} }
// If we use htmlspecialchars, it causes issues with mixed quotes. addslashes() seems to handle it.
$row['id_field'] = $row[$query['id_field']];
}
$row['id_field'] = addslashes($row['id_field']);
$data = ($query['nextmatch_template']) ? array(1=>$row) : $row; $data = ($query['nextmatch_template']) ? array(1=>$row) : $row;
$widget =& CreateObject('etemplate.etemplate', $query['template']); $widget =& CreateObject('etemplate.etemplate', $query['template']);
$html = addslashes(str_replace("\n", '', $widget->show($data, '', $readonlys))); $html = addslashes(str_replace("\n", '', $widget->show($data, '', $readonlys)));
// If we use htmlspecialchars, it causes issues with mixed quotes. addslashes() seems to handle it.
$row['id_field'] = addslashes($row[$query['id_field']]);
$row['title'] = addslashes($row['title']); $row['title'] = addslashes($row['title']);
$response->addScript("add_ajax_result('$result_id', '${row['id_field']}', '" . $row['title'] . "', '$html');"); $response->addScript("add_ajax_result('$result_id', '${row['id_field']}', '" . $row['title'] . "', '$html');");
$count++; $count++;
if($count > $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) { if($count > $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) {