Merge branch 'node_middleware'

diff --git a/forms.py b/forms.py
index 48e1d7f..a1785fb 100644 (file)
--- a/forms.py
+++ b/forms.py
@@ -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:

diff --git a/migrations/0005_add_attribute_values.py b/migrations/0005_add_attribute_values.py
index d8675ee..9bea73f 100644 (file)
--- a/migrations/0005_add_attribute_values.py
+++ b/migrations/0005_add_attribute_values.py
@@ -40,6 +40,10 @@ class Migration(SchemaMigration):
         # Adding unique constraint on 'Attribute', fields ['value_object_id', 'value_content_type']
         db.create_unique('philo_attribute', ['value_object_id', 'value_content_type_id'])
 
+        # Manual addition! This is necessary to immediately cause contenttype creation.
+        # (needed for the next migration)
+        db.send_pending_create_signals()
+
 
     def backwards(self, orm):
         

diff --git a/models/fields.py b/models/fields.py
index 74a0525..85c5583 100644 (file)
--- a/models/fields.py
+++ b/models/fields.py
@@ -1,6 +1,7 @@
-from django.db import models
 from django import forms
 from django.core.exceptions import FieldError, ValidationError
+from django.db import models
+from django.db.models.fields import NOT_PROVIDED
 from django.utils import simplejson as json
 from django.utils.text import capfirst
 from philo.signals import entity_class_prepared
@@ -13,11 +14,13 @@ __all__ = ('JSONAttribute', 'ForeignKeyAttribute', 'ManyToManyAttribute')
 class EntityProxyField(object):
        descriptor_class = None
        
-       def __init__(self, *args, **kwargs):
+       def __init__(self, verbose_name=None, help_text=None, default=NOT_PROVIDED, editable=True, *args, **kwargs):
                if self.descriptor_class is None:
                        raise NotImplementedError('EntityProxyField subclasses must specify a descriptor_class.')
-               self.verbose_name = kwargs.get('verbose_name', None)
-               self.help_text = kwargs.get('help_text', None)
+               self.verbose_name = verbose_name
+               self.help_text = help_text
+               self.default = default
+               self.editable = editable
        
        def actually_contribute_to_class(self, sender, **kwargs):
                sender._entity_meta.add_proxy_field(self)
@@ -39,6 +42,9 @@ class EntityProxyField(object):
        
        def value_from_object(self, obj):
                return getattr(obj, self.attname)
+       
+       def has_default(self):
+               return self.default is not NOT_PROVIDED
 
 
 class AttributeFieldDescriptor(object):
@@ -56,7 +62,7 @@ class AttributeFieldDescriptor(object):
                        except KeyError:
                                return None
                else:
-                       raise AttributeError('The \'%s\' attribute can only be accessed from %s instances.' % (self.field.name, owner.__name__))
+                       return None
        
        def __set__(self, instance, value):
                raise NotImplementedError('AttributeFieldDescriptor subclasses must implement a __set__ method.')
@@ -124,6 +130,8 @@ class JSONAttribute(AttributeField):
        
        def formfield(self, **kwargs):
                defaults = {'required': False, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+               if self.has_default():
+                       defaults['initial'] = self.default
                defaults.update(kwargs)
                return self.field_template.formfield(**defaults)
        
@@ -153,6 +161,8 @@ class ForeignKeyAttribute(AttributeField):
        
        def formfield(self, form_class=forms.ModelChoiceField, **kwargs):
                defaults = {'required': False, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+               if self.has_default():
+                       defaults['initial'] = self.default
                defaults.update(kwargs)
                return form_class(self.model._default_manager.complex_filter(self.limit_choices_to), **defaults)