X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/1d3756407233b937d7491bde6dd4046fb8b4b6d6..ca2138fef978345b9076a2f855ed434a0bac65e1:/forms.py

diff --git a/forms.py b/forms.py
index 48e1d7f..192d02b 100644
--- a/forms.py
+++ b/forms.py
@@ -9,7 +9,7 @@ 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, Attribute
+from philo.models import Entity, Template, Contentlet, ContentReference, Attribute, Node, NodeNavigationOverride
 from philo.utils import fattr
 
 
@@ -21,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:
@@ -86,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:
@@ -331,4 +337,45 @@ class ContentReferenceInlineFormSet(ContainerInlineFormSet):
 			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
+		return super(ContentReferenceInlineFormSet, self)._construct_form(i, **kwargs)
+
+
+class NodeWithOverrideForm(forms.ModelForm):
+	title = NodeNavigationOverride._meta.get_field('title').formfield()
+	url = NodeNavigationOverride._meta.get_field('url').formfield()
+	child_navigation = NodeNavigationOverride._meta.get_field('child_navigation').formfield(required=False)
+	
+	def __init__(self, *args, **kwargs):
+		super(NodeWithOverrideForm, self).__init__(*args, **kwargs)
+		if self.instance.pk:
+			self._override = override = self.get_override(self.instance)
+			self.initial.update({
+				'title': override.title,
+				'url': override.url,
+				'child_navigation': override.child_navigation_json
+			})
+	
+	def get_override(self, instance):
+		try:
+			return NodeNavigationOverride.objects.get(parent=self.instance.parent, child=self.instance)
+		except NodeNavigationOverride.DoesNotExist:
+			override = NodeNavigationOverride(parent=self.instance.parent, child=self.instance)
+			override.child_navigation = None
+			return override
+	
+	def save(self, commit=True):
+		obj = super(NodeWithOverrideForm, self).save(commit)
+		cleaned_data = self.cleaned_data
+		override = self.get_override(obj)
+			
+		# Override information should only be set if there was no previous override or if the
+		# information was just manually set - i.e. was not equal to the data on the cached override.
+		if not override.pk or cleaned_data['title'] != self._override.title or cleaned_data['url'] != self._override.url or cleaned_data['child_navigation'] != self._override.child_navigation:
+			override.title = self.cleaned_data['title']
+			override.url = self.cleaned_data['url']
+			override.child_navigation = self.cleaned_data['child_navigation']
+			override.save()
+		return obj
+	
+	class Meta:
+		model = Node
\ No newline at end of file