X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/98bd3a178f3e62e5591e809ac61e07a5bf37c292..ace621afe8c9c2e835001bac819302cbdeb5e2df:/forms.py

diff --git a/forms.py b/forms.py
index 69273f0..a1785fb 100644
--- a/forms.py
+++ b/forms.py
@@ -1,5 +1,7 @@
 from django import forms
 from django.contrib.admin.widgets import AdminTextareaWidget
+from django.contrib.contenttypes.generic import BaseGenericInlineFormSet
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.db.models import Q
 from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm, BaseInlineFormSet
@@ -19,6 +21,8 @@ def proxy_fields_for_entity_model(entity_model, fields=None, exclude=None, widge
 	ignored = []
 	opts = entity_model._entity_meta
 	for f in opts.proxy_fields:
+		if not f.editable:
+			continue
 		if fields and not f.name in fields:
 			continue
 		if exclude and f.name in exclude:
@@ -84,8 +88,12 @@ class EntityForm(EntityFormBase): # Would inherit from ModelForm directly if it
 		instance = super(EntityForm, self).save(commit=False)
 		
 		for f in instance._entity_meta.proxy_fields:
+			if not f.editable or not f.name in cleaned_data:
+				continue
 			if self._meta.fields and f.name not in self._meta.fields:
 				continue
+			if self._meta.exclude and f.name in self._meta.exclude:
+				continue
 			setattr(instance, f.attname, cleaned_data[f.name])
 		
 		if commit:
@@ -150,6 +158,14 @@ class AttributeForm(ModelForm):
 		model = Attribute
 
 
+class AttributeInlineFormSet(BaseGenericInlineFormSet):
+	"Necessary to force the GenericInlineFormset to use the form's save method for new objects."
+	def save_new(self, form, commit):
+		setattr(form.instance, self.ct_field.get_attname(), ContentType.objects.get_for_model(self.instance).pk)
+		setattr(form.instance, self.ct_fk_field.get_attname(), self.instance.pk)
+		return form.save()
+
+
 class ContainerForm(ModelForm):
 	def __init__(self, *args, **kwargs):
 		super(ContainerForm, self).__init__(*args, **kwargs)