X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/e095f691f243784f8c8d0a9773270b9dbead18e9..1422f0d2c8325b2c4d6781bd3c7b21a3d5873b90:/models/base.py?ds=sidebyside diff --git a/models/base.py b/models/base.py index c7b1c26..20693b7 100644 --- a/models/base.py +++ b/models/base.py @@ -2,8 +2,10 @@ from django import forms from django.db import models from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic -from django.utils import simplejson as json from django.core.exceptions import ObjectDoesNotExist +from django.core.validators import RegexValidator +from django.utils import simplejson as json +from django.utils.encoding import smart_str from philo.exceptions import AncestorDoesNotExist from philo.models.fields import JSONField from philo.utils import ContentTypeRegistryLimiter, ContentTypeSubclassLimiter @@ -22,6 +24,7 @@ class Tag(models.Model): class Meta: app_label = 'philo' + ordering = ('name',) class Titled(models.Model): @@ -53,10 +56,15 @@ class AttributeValue(models.Model): def attribute(self): return self.attribute_set.all()[0] - def apply_data(self, data): + def set_value(self, value): raise NotImplementedError - def value_formfield(self, **kwargs): + def value_formfields(self, **kwargs): + """Define any formfields that would be used to construct an instance of this value.""" + raise NotImplementedError + + def construct_instance(self, **kwargs): + """Apply cleaned data from the formfields generated by valid_formfields to oneself.""" raise NotImplementedError def __unicode__(self): @@ -70,17 +78,22 @@ attribute_value_limiter = ContentTypeSubclassLimiter(AttributeValue) class JSONValue(AttributeValue): - value = JSONField() #verbose_name='Value (JSON)', help_text='This value must be valid JSON.') + value = JSONField(verbose_name='Value (JSON)', help_text='This value must be valid JSON.', default='null') def __unicode__(self): - return self.value_json + return smart_str(self.value) + + def value_formfields(self): + kwargs = {'initial': self.value_json} + field = self._meta.get_field('value') + return {field.name: field.formfield(**kwargs)} - def value_formfield(self, **kwargs): - kwargs['initial'] = self.value_json - return self._meta.get_field('value').formfield(**kwargs) + def construct_instance(self, **kwargs): + field_name = self._meta.get_field('value').name + self.set_value(kwargs.pop(field_name, None)) - def apply_data(self, cleaned_data): - self.value = cleaned_data.get('value', None) + def set_value(self, value): + self.value = value class Meta: app_label = 'philo' @@ -91,19 +104,33 @@ class ForeignKeyValue(AttributeValue): object_id = models.PositiveIntegerField(verbose_name='Value ID', null=True, blank=True) value = generic.GenericForeignKey() - def value_formfield(self, form_class=forms.ModelChoiceField, **kwargs): - if self.content_type is None: - return None - kwargs.update({'initial': self.object_id, 'required': False}) - return form_class(self.content_type.model_class()._default_manager.all(), **kwargs) - - def apply_data(self, cleaned_data): - if 'value' in cleaned_data and cleaned_data['value'] is not None: - self.value = cleaned_data['value'] - else: - self.content_type = cleaned_data.get('content_type', None) - # If there is no value set in the cleaned data, clear the stored value. + def value_formfields(self): + field = self._meta.get_field('content_type') + fields = {field.name: field.formfield(initial=getattr(self.content_type, 'pk', None))} + + if self.content_type: + kwargs = { + 'initial': self.object_id, + 'required': False, + 'queryset': self.content_type.model_class()._default_manager.all() + } + fields['value'] = forms.ModelChoiceField(**kwargs) + return fields + + def construct_instance(self, **kwargs): + field_name = self._meta.get_field('content_type').name + ct = kwargs.pop(field_name, None) + if ct is None or ct != self.content_type: self.object_id = None + self.content_type = ct + else: + value = kwargs.pop('value', None) + self.set_value(value) + if value is None: + self.content_type = ct + + def set_value(self, value): + self.value = value class Meta: app_label = 'philo' @@ -151,19 +178,29 @@ class ManyToManyValue(AttributeValue): value = property(get_value, set_value) - def value_formfield(self, form_class=forms.ModelMultipleChoiceField, **kwargs): - if self.content_type is None: - return None - kwargs.update({'initial': self.get_object_id_list(), 'required': False}) - return form_class(self.content_type.model_class()._default_manager.all(), **kwargs) - - def apply_data(self, cleaned_data): - if 'value' in cleaned_data and cleaned_data['value'] is not None: - self.value = cleaned_data['value'] + def value_formfields(self): + field = self._meta.get_field('content_type') + fields = {field.name: field.formfield(initial=getattr(self.content_type, 'pk', None))} + + if self.content_type: + kwargs = { + 'initial': self.get_object_id_list(), + 'required': False, + 'queryset': self.content_type.model_class()._default_manager.all() + } + fields['value'] = forms.ModelMultipleChoiceField(**kwargs) + return fields + + def construct_instance(self, **kwargs): + field_name = self._meta.get_field('content_type').name + ct = kwargs.pop(field_name, None) + if ct is None or ct != self.content_type: + self.values.clear() + self.content_type = ct else: - self.content_type = cleaned_data.get('content_type', None) - # If there is no value set in the cleaned data, clear the stored value. - self.value = [] + value = kwargs.get('value', self.content_type.model_class()._default_manager.none()) + self.set_value(value) + construct_instance.alters_data = True class Meta: app_label = 'philo' @@ -178,7 +215,7 @@ class Attribute(models.Model): value_object_id = models.PositiveIntegerField(verbose_name='Value ID', null=True, blank=True) value = generic.GenericForeignKey('value_content_type', 'value_object_id') - key = models.CharField(max_length=255) + key = models.CharField(max_length=255, validators=[RegexValidator("\w+")], help_text="Must contain one or more alphanumeric characters or underscores.") def __unicode__(self): return u'"%s": %s' % (self.key, self.value) @@ -242,37 +279,6 @@ class Entity(models.Model): def attributes(self): return QuerySetMapper(self.attribute_set.all()) - @property - def _added_attribute_registry(self): - if not hasattr(self, '_real_added_attribute_registry'): - self._real_added_attribute_registry = {} - return self._real_added_attribute_registry - - @property - def _removed_attribute_registry(self): - if not hasattr(self, '_real_removed_attribute_registry'): - self._real_removed_attribute_registry = [] - return self._real_removed_attribute_registry - - def save(self, *args, **kwargs): - super(Entity, self).save(*args, **kwargs) - - for key in self._removed_attribute_registry: - self.attribute_set.filter(key__exact=key).delete() - del self._removed_attribute_registry[:] - - for field, value in self._added_attribute_registry.items(): - try: - attribute = self.attribute_set.get(key__exact=field.key) - except Attribute.DoesNotExist: - attribute = Attribute() - attribute.entity = self - attribute.key = field.key - - field.set_attribute_value(attribute, value) - attribute.save() - self._added_attribute_registry.clear() - class Meta: abstract = True