Ticket #13618: 13618_updated.diff

django/contrib/admin/helpers.py

@@ -25 +25 @@
 class AdminForm(object):
     def __init__(self, form, fieldsets, prepopulated_fields, readonly_fields=None, model_admin=None):
         self.form, self.fieldsets = form, normalize_fieldsets(fieldsets)
-        self.prepopulated_fields = [{
-            'field': form[field_name],
-            'dependencies': [form[f] for f in dependencies]
-        } for field_name, dependencies in prepopulated_fields.items()]
         self.model_admin = model_admin
         if readonly_fields is None:
             readonly_fields = ()
         self.readonly_fields = readonly_fields
+        self.prepopulated_fields = [{
+            'field': form[field_name],
+            'dependencies': [form[f] for f in dependencies]
+        } for field_name, dependencies in prepopulated_fields.items()
+              if field_name not in self.readonly_fields]
 
     def __iter__(self):
         for name, options in self.fieldsets:

tests/regressiontests/admin_validation/models.py

@@ -7 +7 @@
 
 class Album(models.Model):
     title = models.CharField(max_length=150)
+    slug = models.CharField(max_length=150)
 
 
 class Song(models.Model):

tests/regressiontests/admin_validation/tests.py

@@ -1 +1 @@
 from django.contrib import admin
 from django import forms
+from django.contrib.admin import helpers
 from django.contrib.admin.validation import validate, validate_inline, \
                                             ImproperlyConfigured
 from django.test import TestCase
+from django.http import HttpRequest
 
 from models import Song, Book, Album, TwoAlbumFKAndAnE
 
@@ -153 +155 @@
 
         validate(SongAdmin, Song)
 
+    def test_prepopulated_readonly(self):
+        """
+        Regression for ticket #13618.
+        
+        In some cases, you may want a field to be prepopulated part of the
+        time, and readonly at other times.  One can use the get_readonly_fields
+        method to change the readonly fields dynamically, but adding a
+        prepopulated field to the list of readonly fields generated an error:
+        
+        KeyError: "Key 'slug' not found in Form"
+        """
+        class AlbumAdmin(admin.ModelAdmin):
+            prepopulated_fields = {'slug': ['title']}
+
+            def get_readonly_fields(self, request, obj=None):
+                return ['slug']
+
+        request = HttpRequest()
+        adm = AlbumAdmin(Album, admin.site)
+        Form = adm.get_form(request, None)
+        adm_form = helpers.AdminForm(Form(), list(adm.get_fieldsets(request)),
+            adm.prepopulated_fields, adm.get_readonly_fields(request),
+            model_admin=self)
+        self.assertEqual(adm_form.prepopulated_fields, [])
+        self.assertEqual(adm_form.readonly_fields, ['slug'])
+
     def test_nonexistant_field(self):
         class SongAdmin(admin.ModelAdmin):
             readonly_fields = ("title", "nonexistant")