innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #348 -- Fixed bug in admin JavaScript filter interface. Thanks for the patch, Gary Wilson 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-08-25 23:33:58 +00:00
parent 132605d889
commit 70740d6eca
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/admin/media/js/SelectBox.js
View File

@ -6,7 +6,7 @@ var SelectBox = {
SelectBox.cache[id] = new Array(); SelectBox.cache[id] = new Array();
var cache = SelectBox.cache[id]; var cache = SelectBox.cache[id];
for (var i = 0; (node = box.options[i]); i++) { for (var i = 0; (node = box.options[i]); i++) {
cache.push({ value: node.value, text: node.text, displayed: 1 }); cache.push({value: node.value, text: node.text, displayed: 1});
} }
}, },
redisplay: function(id) { redisplay: function(id) {
@ -50,7 +50,7 @@ var SelectBox = {
SelectBox.cache[id].length--; SelectBox.cache[id].length--;
}, },
add_to_cache: function(id, option) { add_to_cache: function(id, option) {
SelectBox.cache[id].push({ value: option.value, text: option.text, displayed: 1 }); SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1});
}, },
cache_contains: function(id, value) { cache_contains: function(id, value) {
// Check if an item is contained in the cache // Check if an item is contained in the cache
@ -68,7 +68,7 @@ var SelectBox = {
var option; var option;
for (var i = 0; (option = from_box.options[i]); i++) { for (var i = 0; (option = from_box.options[i]); i++) {
if (option.selected && SelectBox.cache_contains(from, option.value)) { if (option.selected && SelectBox.cache_contains(from, option.value)) {
SelectBox.add_to_cache(to, { value: option.value, text: option.text, displayed: 1 }); SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
SelectBox.delete_from_cache(from, option.value); SelectBox.delete_from_cache(from, option.value);
} }
} }
@ -80,8 +80,10 @@ var SelectBox = {
var to_box = document.getElementById(to); var to_box = document.getElementById(to);
var option; var option;
for (var i = 0; (option = from_box.options[i]); i++) { for (var i = 0; (option = from_box.options[i]); i++) {
SelectBox.add_to_cache(to, { value: option.value, text: option.text, displayed: 1 }); if (SelectBox.cache_contains(from, option.value)) {
SelectBox.delete_from_cache(from, option.value); SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
SelectBox.delete_from_cache(from, option.value);
}
} }
SelectBox.redisplay(from); SelectBox.redisplay(from);
SelectBox.redisplay(to); SelectBox.redisplay(to);