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

bug #3911 Filtering database names includes empty groupings

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-10-09 18:58:40 +05:30
parent 5579ff1c72
commit 3c89e2ca6b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
- bug #4104 Can't edit updatable view when searching
- bug #4108 Missing refresh by deleting databases
- bug #3995 Drizzle server charset notice
- bug #3911 Filtering database names includes empty groupings
4.0.8.0 (2013-10-06)
- bug #3988 Rename view is not working

23
js/navigation.js
View File

@ -928,18 +928,23 @@ var PMA_fastFilter = {
}
});
var container_filter = function ($curr, str) {
$curr.children('li').children('a.container').each(function () {
var $group = $(this).parent().children('ul');
if ($group.children('li').children('a.container').length > 0) {
container_filter($group); // recursive
}
$group.parent().show().removeClass('hidden');
if ($group.children().not('.hidden').length == 0) {
$group.parent().hide().addClass('hidden');
$curr.children('ul').children('li.navGroup').each(function() {
var $group = $(this);
$group.children('div.list_container').each(function() {
container_filter($(this)); // recursive
});
$group.show().removeClass('hidden');
if ($group.children('div.list_container').children('ul')
.children('li').not('.hidden').length === 0) {
$group.hide().addClass('hidden');
}
});
};
container_filter($obj, str);
if ($(this).closest('li.fast_filter').is('.db_fast_filter')) {
container_filter($('#pma_navigation_tree_content'), str);
} else {
container_filter($obj, str);
}
if ($(this).val() != this.defaultValue && $(this).val() != '') {
if (! $obj.data('fastFilter')) {
$obj.data(