L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-14417 fixed sql for menu adv search - multimenu already fixed today; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak
2008-04-19 21:22:03 +00:00
parent 029cf8469b
commit a4e3818f2a
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/field/menu/field.class.php
+28 -8
View File
@@ -57,17 +57,37 @@ class data_field_menu extends data_field_base {
return $str;
}
function display_search_field($value = '') {
function display_search_field($content = '') {
global $CFG;
$temp = get_records_sql_menu('SELECT id, content from '.$CFG->prefix.'data_content WHERE fieldid='.$this->field->id.' GROUP BY content ORDER BY content');
$options = array();
if(!empty($temp)) {
$options[''] = ''; //Make first index blank.
foreach ($temp as $key) {
$options[$key] = $key; //Build following indicies from the sql.
$usedoptions = array();
$sql = "SELECT DISTINCT content
FROM {$CFG->prefix}data_content
WHERE fieldid={$this->field->id} AND content IS NOT NULL";
if ($used = get_records_sql($sql)) {
foreach ($used as $data) {
$value = $data->content;
if ($value === '') {
continue;
}
$usedoptions[$value] = $value;
}
}
return choose_from_menu($options, 'f_'.$this->field->id, $value, 'choose', '', 0, true);
$options = array();
foreach (explode("\n",$this->field->param1) as $option) {
$option = trim($option);
if (!isset($usedoptions[$option])) {
continue;
}
$options[$option] = $option;
}
if (!$options) {
// oh, nothing to search for
return '';
}
return choose_from_menu($options, 'f_'.$this->field->id, stripslashes($content), ' ', '', 0, true);
}
function parse_search_field() {
mod/data/field/multimenu/field.class.php
+2 -2
View File
@@ -81,11 +81,11 @@ class data_field_multimenu extends data_field_base {
$usedoptions = array();
$sql = "SELECT DISTINCT content
FROM {$CFG->prefix}data_content
WHERE fieldid={$this->field->id}";
WHERE fieldid={$this->field->id} AND content IS NOT NULL";
if ($used = get_records_sql($sql)) {
foreach ($used as $data) {
$valuestr = $data->content;
if (is_null($valuestr) or $valuestr === '') {
if ($valuestr === '') {
continue;
}
$values = explode('##', $valuestr);