mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #13301 -- Corrected problem with capitalization of changelist row headers in admin. Thanks to emyller for the report.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2010-04-11 08:35:04 +00:00
parent f4c76fb604
commit faceca7075
7 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/regressiontests/admin_util/tests.py
View File

@@ -157,7 +157,7 @@ class UtilTests(unittest.TestCase):
"another name"
)
self.assertEquals(
label_for_field("title2", Article, return_attr=True),
label_for_field("title2", Article, return_attr=True),
("another name", None)
)
@@ -179,24 +179,24 @@ class UtilTests(unittest.TestCase):
return "nothing"
self.assertEquals(
label_for_field(test_callable, Article),
"test_callable"
"Test callable"
)
self.assertEquals(
label_for_field(test_callable, Article, return_attr=True),
("test_callable", test_callable)
("Test callable", test_callable)
)
self.assertEquals(
label_for_field("test_from_model", Article),
"test_from_model"
"Test from model"
)
self.assertEquals(
label_for_field("test_from_model", Article, return_attr=True),
("test_from_model", Article.test_from_model)
("Test from model", Article.test_from_model)
)
self.assertEquals(
label_for_field("test_from_model_with_override", Article),
"not what you expect"
"not What you Expect"
)
self.assertEquals(
@@ -207,15 +207,16 @@ class UtilTests(unittest.TestCase):
class MockModelAdmin(object):
def test_from_model(self, obj):
return "nothing"
test_from_model.short_description = "not really the model"
test_from_model.short_description = "not Really the Model"
self.assertEquals(
label_for_field("test_from_model", Article, model_admin=MockModelAdmin),
"not really the model"
"not Really the Model"
)
self.assertEquals(
label_for_field("test_from_model", Article,
model_admin = MockModelAdmin,
return_attr = True
),
("not really the model", MockModelAdmin.test_from_model)
("not Really the Model", MockModelAdmin.test_from_model)
)