Merge branch 'master' of git://github.com/melinath/philo

[philo.git] / models / fields.py

diff --git a/models/fields.py b/models/fields.py
index 74a0525..3e43c0f 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.')
@@ -86,7 +92,7 @@ class ForeignKeyAttributeDescriptor(AttributeFieldDescriptor):
 
 class ManyToManyAttributeDescriptor(AttributeFieldDescriptor):
        def __set__(self, instance, value):
-               if isinstance(value, models.QuerySet):
+               if isinstance(value, models.query.QuerySet):
                        if self.field in instance._removed_attribute_registry:
                                instance._removed_attribute_registry.remove(self.field)
                        instance._added_attribute_registry[self.field] = value
@@ -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)