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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12947 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 17 insertions, 12 deletions

diff --git a/tests/regressiontests/admin_util/models.py b/tests/regressiontests/admin_util/models.py
index e81f7bbc25..493e1271ad 100644
--- a/tests/regressiontests/admin_util/models.py
+++ b/tests/regressiontests/admin_util/models.py
@@ -16,7 +16,7 @@ class Article(models.Model):
 
     def test_from_model_with_override(self):
         return "nothing"
-    test_from_model_with_override.short_description = "not what you expect"
+    test_from_model_with_override.short_description = "not What you Expect"
 
 class Count(models.Model):
     num = models.PositiveSmallIntegerField()
diff --git a/tests/regressiontests/admin_util/tests.py b/tests/regressiontests/admin_util/tests.py
index f874b318f9..5ea0ac585e 100644
--- a/tests/regressiontests/admin_util/tests.py
+++ b/tests/regressiontests/admin_util/tests.py
@@ -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)
         )
diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index be5782886f..a2700ba747 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -474,7 +474,7 @@ class Post(models.Model):
 
 class PostAdmin(admin.ModelAdmin):
     list_display = ['title', 'public']
-    readonly_fields = ('posted', 'awesomeness_level', 'coolness', lambda obj: "foo")
+    readonly_fields = ('posted', 'awesomeness_level', 'coolness', 'value', lambda obj: "foo")
 
     inlines = [
         LinkInline
@@ -486,6 +486,9 @@ class PostAdmin(admin.ModelAdmin):
         else:
             return "Unkown coolness."
 
+    def value(self, instance):
+        return 1000
+    value.short_description = 'Value in $US'
 
 class Gadget(models.Model):
     name = models.CharField(max_length=100)
@@ -567,7 +570,7 @@ class CyclicTwo(models.Model):
         return self.name
 
 class Topping(models.Model):
-    name = models.CharField(max_length=20) 
+    name = models.CharField(max_length=20)
 
 class Pizza(models.Model):
     name = models.CharField(max_length=20)
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 8749fee5ce..23964a949c 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -1970,6 +1970,7 @@ class ReadonlyTest(TestCase):
         self.assertContains(response, '<div class="form-row coolness">')
         self.assertContains(response, '<div class="form-row awesomeness_level">')
         self.assertContains(response, '<div class="form-row posted">')
+        self.assertContains(response, '<div class="form-row value">')
         self.assertContains(response, '<div class="form-row ">')
 
         p = Post.objects.create(title="I worked on readonly_fields", content="Its good stuff")