X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/cec32849d48d9e36c030224e2eb9631d31ef17a2..ee00114ceae49d0017911f4da98de6c5e721ee59:/philo/models/fields/__init__.py?ds=sidebyside

diff --git a/philo/models/fields/__init__.py b/philo/models/fields/__init__.py
index 1f9603e..7ab4326 100644
--- a/philo/models/fields/__init__.py
+++ b/philo/models/fields/__init__.py
@@ -5,12 +5,15 @@ from django.db import models
 from django.utils import simplejson as json
 from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy as _
+
 from philo.forms.fields import JSONFormField
+from philo.utils.registry import RegistryIterator
 from philo.validators import TemplateValidator, json_validator
 #from philo.models.fields.entities import *
 
 
 class TemplateField(models.TextField):
+	"""A :class:`TextField` which is validated with a :class:`.TemplateValidator`. ``allow``, ``disallow``, and ``secure`` will be passed into the validator's construction."""
 	def __init__(self, allow=None, disallow=None, secure=True, *args, **kwargs):
 		super(TemplateField, self).__init__(*args, **kwargs)
 		self.validators.append(TemplateValidator(allow, disallow, secure))
@@ -40,6 +43,7 @@ class JSONDescriptor(object):
 
 
 class JSONField(models.TextField):
+	"""A :class:`TextField` which stores its value on the model instance as a python object and stores its value in the database as JSON. Validated with :func:`.json_validator`."""
 	default_validators = [json_validator]
 	
 	def get_attname(self):
@@ -68,6 +72,7 @@ class JSONField(models.TextField):
 
 
 class SlugMultipleChoiceField(models.Field):
+	"""Stores a selection of multiple items with unique slugs in the form of a comma-separated list. Also knows how to correctly handle :class:`RegistryIterator`\ s passed in as choices."""
 	__metaclass__ = models.SubfieldBase
 	description = _("Comma-separated slug field")
 	
@@ -123,6 +128,16 @@ class SlugMultipleChoiceField(models.Field):
 		if invalid_values:
 			# should really make a custom message.
 			raise ValidationError(self.error_messages['invalid_choice'] % invalid_values)
+	
+	def _get_choices(self):
+		if isinstance(self._choices, RegistryIterator):
+			return self._choices.copy()
+		elif hasattr(self._choices, 'next'):
+			choices, self._choices = itertools.tee(self._choices)
+			return choices
+		else:
+			return self._choices
+	choices = property(_get_choices)
 
 
 try: