Added slug to TagAdmin list_display. Corrected FeedMultiViewMixin to also paginate...

[philo.git] / forms.py

diff --git a/forms.py b/forms.py
index fd629c0..57e772d 100644 (file)
--- a/forms.py
+++ b/forms.py
@@ -1,8 +1,11 @@
+from django import forms
+from django.contrib.admin.widgets import AdminTextareaWidget

 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 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.admin.widgets import ModelLookupWidget

 from philo.models import Entity, Template, Contentlet, ContentReference
 from philo.models.fields import RelationshipField
 from philo.utils import fattr
 from philo.models import Entity, Template, Contentlet, ContentReference
 from philo.models.fields import RelationshipField
 from philo.utils import fattr


@@ -130,12 +133,28 @@ class ContainerForm(ModelForm):
 
 
 class ContentletForm(ContainerForm):
 
 
 class ContentletForm(ContainerForm):

+       content = forms.CharField(required=False, widget=AdminTextareaWidget)
+       
+       def should_delete(self):
+               return not bool(self.cleaned_data['content'])
+       

        class Meta:
                model = Contentlet
                fields = ['name', 'content', 'dynamic']
 
 
 class ContentReferenceForm(ContainerForm):
        class Meta:
                model = Contentlet
                fields = ['name', 'content', 'dynamic']
 
 
 class ContentReferenceForm(ContainerForm):

+       def __init__(self, *args, **kwargs):
+               super(ContentReferenceForm, self).__init__(*args, **kwargs)
+               try:
+                       self.fields['content_id'].widget = ModelLookupWidget(self.instance.content_type)
+               except ObjectDoesNotExist:
+                       # This will happen when an empty form (which we will never use) gets instantiated.
+                       pass
+       
+       def should_delete(self):
+               return (self.cleaned_data['content_id'] is None)
+       

        class Meta:
                model = ContentReference
                fields = ['name', 'content_id']
        class Meta:
                model = ContentReference
                fields = ['name', 'content_id']


@@ -157,35 +176,88 @@ class ContainerInlineFormSet(BaseInlineFormSet):
                        backlink_value = getattr(self.instance, self.fk.rel.field_name)
                if queryset is None:
                        queryset = self.model._default_manager
                        backlink_value = getattr(self.instance, self.fk.rel.field_name)
                if queryset is None:
                        queryset = self.model._default_manager

-               qs = queryset.filter(**{self.fk.name: backlink_value}).filter(name__in=containers)
+               qs = queryset.filter(**{self.fk.name: backlink_value})

                # End cribbed from BaseInline
                
                # End cribbed from BaseInline
                

-               self.container_instances = []
-               for container in qs:
-                       self.container_instances.append(container)
-                       containers.remove(container.name)
+               self.container_instances, qs = self.get_container_instances(containers, qs)

                self.extra_containers = containers
                self.extra = len(self.extra_containers)
                super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix, queryset=qs)
        
                self.extra_containers = containers
                self.extra = len(self.extra_containers)
                super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix, queryset=qs)
        

+       def get_container_instances(self, containers, qs):
+               raise NotImplementedError
+       

        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
        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

+       
+       def save_existing_objects(self, commit=True):
+               self.changed_objects = []
+               self.deleted_objects = []
+               if not self.get_queryset():
+                       return []
+
+               saved_instances = []
+               for form in self.initial_forms:
+                       pk_name = self._pk_field.name
+                       raw_pk_value = form._raw_value(pk_name)
+
+                       # clean() for different types of PK fields can sometimes return
+                       # the model instance, and sometimes the PK. Handle either.
+                       pk_value = form.fields[pk_name].clean(raw_pk_value)
+                       pk_value = getattr(pk_value, 'pk', pk_value)
+
+                       obj = self._existing_object(pk_value)
+                       if form.should_delete():
+                               self.deleted_objects.append(obj)
+                               obj.delete()
+                               continue
+                       if form.has_changed():
+                               self.changed_objects.append((obj, form.changed_data))
+                               saved_instances.append(self.save_existing(form, obj, commit=commit))
+                               if not commit:
+                                       self.saved_forms.append(form)
+               return saved_instances
+
+       def save_new_objects(self, commit=True):
+               self.new_objects = []
+               for form in self.extra_forms:
+                       if not form.has_changed():
+                               continue
+                       # If someone has marked an add form for deletion, don't save the
+                       # object.
+                       if form.should_delete():
+                               continue
+                       self.new_objects.append(self.save_new(form, commit=commit))
+                       if not commit:
+                               self.saved_forms.append(form)
+               return self.new_objects

 
 
 class ContentletInlineFormSet(ContainerInlineFormSet):
        def __init__(self, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None):
                if instance is None:
                        self.instance = self.fk.rel.to()
 
 
 class ContentletInlineFormSet(ContainerInlineFormSet):
        def __init__(self, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None):
                if instance is None:
                        self.instance = self.fk.rel.to()

-                       containers = []

                else:
                        self.instance = instance
                else:
                        self.instance = instance

+               
+               try:

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

+               except ObjectDoesNotExist:
+                       containers = []

        
                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 get_container_instances(self, containers, qs):
+               qs = qs.filter(name__in=containers)
+               container_instances = []
+               for container in qs:
+                       container_instances.append(container)
+                       containers.remove(container.name)
+               return container_instances, 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])
        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])


@@ -197,12 +269,23 @@ class ContentReferenceInlineFormSet(ContainerInlineFormSet):
        def __init__(self, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None):
                if instance is None:
                        self.instance = self.fk.rel.to()
        def __init__(self, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None):
                if instance is None:
                        self.instance = self.fk.rel.to()

-                       containers = []

                else:
                        self.instance = instance
                else:
                        self.instance = instance

+               
+               try:

                        containers = list(self.instance.containers[1])
                        containers = list(self.instance.containers[1])

+               except ObjectDoesNotExist:
+                       containers = []

        
                super(ContentReferenceInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset)
        
                super(ContentReferenceInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset)

+       
+       def get_container_instances(self, containers, qs):
+               qs = qs.filter(name__in=[c[0] for c in containers])
+               container_instances = []
+               for container in qs:
+                       container_instances.append(container)
+                       containers.remove((container.name, container.content_type))
+               return container_instances, qs

 
        def _construct_form(self, i, **kwargs):
                if i >= self.initial_form_count(): # and not kwargs.get('instance'):
 
        def _construct_form(self, i, **kwargs):
                if i >= self.initial_form_count(): # and not kwargs.get('instance'):