gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use multiple selection for [NOT] IN/BETWEEN searches.

Browse Source
This commit is contained in:
Hugues Peccatte 2013-11-09 17:52:50 +01:00
parent 243cab4100
commit f810615579
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/tbl_change.js
View File

@ -505,3 +505,23 @@ AJAX.registerOnload('tbl_change.js', function () {
}
});
});
function changeValueFieldType(elem, searchIndex)
{
var fieldsValue = $("select#fieldID_" + searchIndex);
if (0 == fieldsValue.size()) {
return;
}
var type = $(elem).val();
if (
'IN (...)' == type
|| 'NOT IN (...)' == type
|| 'BETWEEN' == type
|| 'NOT BETWEEN' == type
) {
$("#fieldID_" + searchIndex).attr('multiple', '');
} else {
$("#fieldID_" + searchIndex).removeAttr('multiple');
}
}

10
libraries/TableSearch.class.php
View File

@ -586,8 +586,14 @@ EOT;
) {
$func_type = str_replace(' (...)', '', $func_type);
//Don't explode if this is already an array
//(Case for (NOT) IN/BETWEEN.)
if (is_array($criteriaValues)) {
$values = $criteriaValues;
} else {
$values = explode(',', $criteriaValues);
}
// quote values one by one
$values = explode(',', $criteriaValues);
foreach ($values as &$value) {
$value = $quot . PMA_Util::sqlAddSlashes(trim($value))
. $quot;
@ -909,7 +915,7 @@ EOT;
$type = $this->_columnTypes[$column_index];
$collation = $this->_columnCollations[$column_index];
//Gets column's comparison operators depending on column type
$func = '<select name="criteriaColumnOperators[' . $search_index . ']">';
$func = '<select name="criteriaColumnOperators[' . $search_index . ']" onchange="changeValueFieldType(this, ' . $search_index . ')">';
$func .= $GLOBALS['PMA_Types']->getTypeOperatorsHtml(
preg_replace('@\(.*@s', '', $this->_columnTypes[$column_index]),
$this->_columnNullFlags[$column_index], $selected_operator

4
libraries/Util.class.php
View File

@ -309,6 +309,10 @@ class PMA_Util
$a_string = str_replace('\'', '\'\'', $a_string);
}
if ('' === $a_string) {
$a_string = 'NULL';
}
return $a_string;
} // end of the 'sqlAddSlashes()' function