Populate values for ApplicationContent admin_fields from parameters

Stefan Reinhard · Stefan Reinhard · commit 6f9466611203 · 2014-02-04T17:15:40.000+01:00
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -281,6 +281,8 @@ def __init__(self, *args, **kwargs):
 
                     for k, v in self.custom_fields.items():
                         self.fields[k] = v
+                        if k in self.instance.parameters:
+                            self.fields[k].initial = self.instance.parameters[k]
 
             def save(self, commit=True, *args, **kwargs):
                 # Django ModelForms return the model instance from save. We'll
diff --git a/feincms/tests/test_page.py b/feincms/tests/test_page.py
@@ -1179,6 +1179,17 @@ def test_25_applicationcontent(self):
         # Ensure ApplicationContent's admin_fields support works properly
         self.assertContains(self.client.get('/admin/page/page/%d/' % page.id),
             'exclusive_subpages')
+        self.assertContains(
+            self.client.get('/admin/page/page/%d/' % page.id),
+            'custom_field'
+        )
+
+        # Check if admin_fields get populated correctly
+        app_ct = page.applicationcontent_set.all()[0]
+        app_ct.parameters = '{"custom_field":"val42", "exclusive_subpages": false}'
+        app_ct.save()
+        r = self.client.get('/admin/page/page/%d/' % page.id)
+        self.assertContains(r, 'val42')
 
     def test_26_page_form_initial(self):
         self.create_default_page_set()
diff --git a/tests/testapp/models.py b/tests/testapp/models.py
@@ -38,8 +38,9 @@ def get_admin_fields(form, *args, **kwargs):
             label=capfirst(_('exclusive subpages')),
             required=False,
             initial=form.instance.parameters.get('exclusive_subpages', False),
-            help_text=_('Exclude everything other than the application\'s content when rendering subpages.'),
-            ),
+            help_text=_('Exclude everything other when rendering subpages.'),
+        ),
+        'custom_field': forms.CharField(),
     }
 
 Page.create_content_type(ApplicationContent, APPLICATIONS=(
