p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1578 from rmutter/ticket_20821 

Fixed #20821 -- Added tooltips to Admin SelectBox widget
This commit is contained in:
Julien Phalip 2013-09-06 14:03:58 -07:00
parent ce5e09353d c438cc2a36
commit d5df914fe1
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/admin/static/admin/js/SelectBox.js
View File

@ -16,7 +16,10 @@ var SelectBox = {
for (var i = 0, j = SelectBox.cache[id].length; i < j; i++) { for (var i = 0, j = SelectBox.cache[id].length; i < j; i++) {
var node = SelectBox.cache[id][i]; var node = SelectBox.cache[id][i];
if (node.displayed) { if (node.displayed) {
box.options[box.options.length] = new Option(node.text, node.value, false, false); var new_option = new Option(node.text, node.value, false, false);
// Shows a tooltip when hovering over the option
new_option.setAttribute("title", node.text);
box.options[box.options.length] = new_option;
} }
} }
}, },

11
tests/admin_widgets/tests.py
View File

@ -699,7 +699,12 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas
self.assertActiveButtons(mode, field_name, False, False, True, False) self.assertActiveButtons(mode, field_name, False, False, True, False)
# Choose some options ------------------------------------------------ # Choose some options ------------------------------------------------
self.get_select_option(from_box, str(self.lisa.id)).click() from_lisa_select_option = self.get_select_option(from_box, str(self.lisa.id))
# Check the title attribute is there for tool tips: ticket #20821
self.assertEqual(from_lisa_select_option.get_attribute('title'), from_lisa_select_option.get_attribute('text'))
from_lisa_select_option.click()
self.get_select_option(from_box, str(self.jason.id)).click() self.get_select_option(from_box, str(self.jason.id)).click()
self.get_select_option(from_box, str(self.bob.id)).click() self.get_select_option(from_box, str(self.bob.id)).click()
self.get_select_option(from_box, str(self.john.id)).click() self.get_select_option(from_box, str(self.john.id)).click()
@ -714,6 +719,10 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas
[str(self.lisa.id), str(self.bob.id), [str(self.lisa.id), str(self.bob.id),
str(self.jason.id), str(self.john.id)]) str(self.jason.id), str(self.john.id)])
# Check the tooltip is still there after moving: ticket #20821
to_lisa_select_option = self.get_select_option(to_box, str(self.lisa.id))
self.assertEqual(to_lisa_select_option.get_attribute('title'), to_lisa_select_option.get_attribute('text'))
# Remove some options ------------------------------------------------- # Remove some options -------------------------------------------------
self.get_select_option(to_box, str(self.lisa.id)).click() self.get_select_option(to_box, str(self.lisa.id)).click()
self.get_select_option(to_box, str(self.bob.id)).click() self.get_select_option(to_box, str(self.bob.id)).click()