Merge branch 'master' into next

matthiask · matthiask · commit e0faadcb435f · 2014-06-03T14:07:26.000+02:00
* master:
  Populate values for ApplicationContent admin_fields from parameters

Conflicts:
	tests/testapp/tests/test_page.py
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -213,6 +213,8 @@ def __init__(self, *args, **kwargs):
                     for k, v in self.custom_fields.items():
                         v.initial = self.instance.parameters.get(k)
                         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/tests/testapp/tests/test_page.py b/tests/testapp/tests/test_page.py
@@ -1427,8 +1427,8 @@ def test_25_applicationcontent(self):
 
         # 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.parameters = (
+            '{"custom_field": "val42", "exclusive_subpages": false}')
         app_ct.save()
         r = self.client.get('/admin/page/page/%d/' % page.id)
         self.assertContains(r, 'val42')
