Merge branch 'master' of git://github.com/lapilofu/philo into develop

[philo.git] / philo / admin / forms / containers.py

diff --git a/philo/admin/forms/containers.py b/philo/admin/forms/containers.py
index 420ba17..987524f 100644 (file)
--- a/philo/admin/forms/containers.py
+++ b/philo/admin/forms/containers.py
@@ -5,6 +5,7 @@ from django.db.models import Q
 from django.forms.models import ModelForm, BaseInlineFormSet, BaseModelFormSet
 from django.forms.formsets import TOTAL_FORM_COUNT
 from django.utils.datastructures import SortedDict
 from django.forms.models import ModelForm, BaseInlineFormSet, BaseModelFormSet
 from django.forms.formsets import TOTAL_FORM_COUNT
 from django.utils.datastructures import SortedDict

+

 from philo.admin.widgets import ModelLookupWidget
 from philo.models import Contentlet, ContentReference
 
 from philo.admin.widgets import ModelLookupWidget
 from philo.models import Contentlet, ContentReference
 


@@ -152,7 +153,7 @@ class ContainerInlineFormSet(BaseInlineFormSet):
 class ContentletInlineFormSet(ContainerInlineFormSet):
        def get_containers(self):
                try:
 class ContentletInlineFormSet(ContainerInlineFormSet):
        def get_containers(self):
                try:

-                       containers = list(self.instance.containers[0])
+                       containers = self.instance.containers[0]

                except ObjectDoesNotExist:
                        containers = []
                
                except ObjectDoesNotExist:
                        containers = []