Ticket #12627: 12627_r12827_with_test.diff

django/forms/forms.py

@@ -6 +6 @@
 from django.utils.copycompat import deepcopy
 from django.utils.datastructures import SortedDict
 from django.utils.html import conditional_escape
+from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
 from django.utils.safestring import mark_safe
 
@@ -292 +293 @@
                     del self.cleaned_data[name]
 
     def _clean_form(self):
+        errors = self.error_class()
         try:
             self.cleaned_data = self.clean()
         except ValidationError, e:
-            self._errors[NON_FIELD_ERRORS] = self.error_class(e.messages)
+            errors.extend(e.messages)
+        if not self.fields:
+            errors.append(_(u'No data was submitted.'))
+        if errors:
+            self._errors[NON_FIELD_ERRORS] = errors
 
     def _post_clean(self):
         """

django/contrib/admin/templates/admin/change_form.html

@@ -55 +55 @@
 
 {% submit_row %}
 
-{% if adminform and add %}
+{% if adminform and add and adminform.form.fields %}
    <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
 {% endif %}
 

tests/regressiontests/admin_views/tests.py

@@ -1991 +1991 @@
         response = self.client.get('/test_admin/admin/admin_views/pizza/add/')
         self.assertEqual(response.status_code, 200)
 
+    def test_all_read_only(self):
+        """
+        #12627 - if all form fields are included in readonly_fields, then the
+        form should be marked as invalid to prevent saving empty objects
+        """
+        response = \
+            self.client.post('/test_admin/admin/admin_views/allreadonly/add/')
+        self.assertEqual(response.status_code, 200)
+
+
 class IncompleteFormTest(TestCase):
     """
     Tests validation of a ModelForm that doesn't explicitly have all data

tests/regressiontests/admin_views/models.py

@@ -575 +575 @@
 class PizzaAdmin(admin.ModelAdmin):
     readonly_fields = ('toppings',)
 
+class AllReadOnly(models.Model):
+    name = models.CharField(max_length=255)
+
+class AllReadOnlyAdmin(admin.ModelAdmin):
+    readonly_fields = ('name',)
+
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
 admin.site.register(Section, save_as=True, inlines=[ArticleInline])
@@ -621 +627 @@
 admin.site.register(ChapterXtra1)
 admin.site.register(Pizza, PizzaAdmin)
 admin.site.register(Topping)
+admin.site.register(AllReadOnly, AllReadOnlyAdmin)