Display of ContainerFormSets functional; display of their values is not; saving of...

diff --git a/admin/pages.py b/admin/pages.py
index fe6f821..03b943f 100644 (file)
--- a/admin/pages.py
+++ b/admin/pages.py
@@ -5,7 +5,7 @@ from philo.admin import widgets
 from philo.admin.base import COLLAPSE_CLASSES
 from philo.admin.nodes import ViewAdmin
 from philo.models.pages import Page, Template, Contentlet, ContentReference
-from philo.forms import TemplateForm, ContentletInlineFormSet, ContentReferenceInlineFormSet
+from philo.forms import TemplateForm, ContentletInlineFormSet, ContentReferenceInlineFormSet, ContentletForm, ContentReferenceForm
 
 
 class ContentletInline(admin.StackedInline):
@@ -13,6 +13,7 @@ class ContentletInline(admin.StackedInline):
        extra = 0
        max_num = 0
        formset = ContentletInlineFormSet
+       form = ContentletForm
        can_delete = False
        template = 'admin/philo/edit_inline/tabular_container.html'
 
@@ -22,6 +23,7 @@ class ContentReferenceInline(admin.StackedInline):
        extra = 0
        max_num = 0
        formset = ContentReferenceInlineFormSet
+       form = ContentReferenceForm
        can_delete = False
        template = 'admin/philo/edit_inline/tabular_container.html'
 

diff --git a/forms.py b/forms.py
index 5f9e7b1..fd629c0 100644 (file)
--- a/forms.py
+++ b/forms.py
@@ -1,8 +1,9 @@
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm, BaseInlineFormSet
+from django.forms.formsets import TOTAL_FORM_COUNT
 from django.template import loader, loader_tags, TemplateDoesNotExist, Context, Template as DjangoTemplate
 from django.utils.datastructures import SortedDict
-from philo.models import Entity, Template
+from philo.models import Entity, Template, Contentlet, ContentReference
 from philo.models.fields import RelationshipField
 from philo.utils import fattr
 
@@ -122,6 +123,24 @@ class TemplateForm(ModelForm):
                model = Template
 
 
+class ContainerForm(ModelForm):
+       def __init__(self, *args, **kwargs):
+               super(ContainerForm, self).__init__(*args, **kwargs)
+               self.verbose_name = self.instance.name.replace('_', ' ')
+
+
+class ContentletForm(ContainerForm):
+       class Meta:
+               model = Contentlet
+               fields = ['name', 'content', 'dynamic']
+
+
+class ContentReferenceForm(ContainerForm):
+       class Meta:
+               model = ContentReference
+               fields = ['name', 'content_id']
+
+
 class ContainerInlineFormSet(BaseInlineFormSet):
        def __init__(self, containers, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None):
                # Unfortunately, I need to add some things to BaseInline between its __init__ and its super call, so
@@ -147,14 +166,13 @@ class ContainerInlineFormSet(BaseInlineFormSet):
                        containers.remove(container.name)
                self.extra_containers = containers
                self.extra = len(self.extra_containers)
-               
-               super(BaseInlineFormSet, self).__init__(data, files, prefix, qs)
+               super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix, queryset=qs)
        
-       def _construct_form(self, i, **kwargs):
-               if i > self.initial_form_count(): # and not kwargs.get('instance'):
-                       kwargs['instance'] = self.model(name=self.extra_containers[i - self.initial_form_count() - 1])
-               
-               return super(ContainerInlineFormSet, self)._construct_form(i, **kwargs)
+       def total_form_count(self):
+               if self.data or self.files:
+                       return self.management_form.cleaned_data[TOTAL_FORM_COUNT]
+               else:
+                       return self.initial_form_count() + self.extra
 
 
 class ContentletInlineFormSet(ContainerInlineFormSet):
@@ -166,7 +184,13 @@ class ContentletInlineFormSet(ContainerInlineFormSet):
                        self.instance = instance
                        containers = list(self.instance.containers[0])
        
-               super(ContentletInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset) 
+               super(ContentletInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset)
+       
+       def _construct_form(self, i, **kwargs):
+               if i >= self.initial_form_count(): # and not kwargs.get('instance'):
+                       kwargs['instance'] = self.model(name=self.extra_containers[i - self.initial_form_count() - 1])
+               
+               return super(ContentletInlineFormSet, self)._construct_form(i, **kwargs)
 
 
 class ContentReferenceInlineFormSet(ContainerInlineFormSet):
@@ -178,4 +202,11 @@ class ContentReferenceInlineFormSet(ContainerInlineFormSet):
                        self.instance = instance
                        containers = list(self.instance.containers[1])
        
-               super(ContentReferenceInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset)
\ No newline at end of file
+               super(ContentReferenceInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset)
+
+       def _construct_form(self, i, **kwargs):
+               if i >= self.initial_form_count(): # and not kwargs.get('instance'):
+                       name, content_type = self.extra_containers[i - self.initial_form_count() - 1]
+                       kwargs['instance'] = self.model(name=name, content_type=content_type)
+
+               return super(ContentReferenceInlineFormSet, self)._construct_form(i, **kwargs)
\ No newline at end of file

diff --git a/templates/admin/philo/edit_inline/tabular_container.html b/templates/admin/philo/edit_inline/tabular_container.html
index b751f52..60ca7f8 100644 (file)
--- a/templates/admin/philo/edit_inline/tabular_container.html
+++ b/templates/admin/philo/edit_inline/tabular_container.html
@@ -1,7 +1,8 @@
 {% load i18n adminmedia %}
+{{ inline_admin_formset.formset.management_form }}
+{% if inline_admin_formset.formset.forms %}
 <div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
   <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
-{{ inline_admin_formset.formset.management_form }}
 <fieldset class="module{% if inline_admin_formset.classes %} {{ inline_admin_formset.classes|join:' ' }}{% endif %}">
    <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
    {{ inline_admin_formset.formset.non_form_errors }}
@@ -27,13 +28,14 @@
                  {% endfor %}
                {% endfor %}
                {% endfor %}
+               {{ inline_admin_form.form.name.as_hidden }}
                {% endspaceless %}
                {% if inline_admin_form.form.non_field_errors %}
                <tr><td colspan="{{ inline_admin_form.field_count }}">{{ inline_admin_form.form.non_field_errors }}</td></tr>
                {% endif %}
                <tr class="{% cycle "row1" "row2" %} {% if forloop.last %} empty-form{% endif %}"
                         id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
-               <th>{{ inline_admin_form.form.name.as_hidden }}{{ inline_admin_form.form.initial.name|capfirst }}</th>
+                       <th>{{ inline_admin_form.form.verbose_name|capfirst }}</th>
                {% for fieldset in inline_admin_form %}
                  {% for line in fieldset %}
                        {% for field in line %}
@@ -120,3 +122,4 @@
        });
 })(django.jQuery);
 </script>
+{% endif %}