X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/72fac53a4cd42e6c9f56a581a85f8b47ba61b2ac..83c66d95a1af4eea014a85668521be6b153ea07f:/models.py?ds=sidebyside diff --git a/models.py b/models.py index 4eb50f7..1d255c7 100644 --- a/models.py +++ b/models.py @@ -19,16 +19,16 @@ from UserDict import DictMixin from templatetags.containers import ContainerNode from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode from django.template.loader import get_template -from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect +from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect from django.core.servers.basehttp import FileWrapper -def _ct_model_name(model): - opts = model._meta - while opts.proxy: - model = opts.proxy_for_model - opts = model._meta - return opts.object_name.lower() +def register_value_model(model): + pass + + +def unregister_value_model(model): + pass class Attribute(models.Model): @@ -38,40 +38,27 @@ class Attribute(models.Model): key = models.CharField(max_length=255) json_value = models.TextField(verbose_name='Value (JSON)', help_text='This value must be valid JSON.') - @property - def value(self): + def get_value(self): return json.loads(self.json_value) + def set_value(self, value): + self.json_value = json.dumps(value) + + def delete_value(self): + self.json_value = json.dumps(None) + + value = property(get_value, set_value, delete_value) + def __unicode__(self): return u'"%s": %s' % (self.key, self.value) class Relationship(models.Model): - _value_models = [] - - @staticmethod - def register_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name not in Relationship._value_models: - Relationship._value_models.append(model_name) - else: - raise TypeError('Relationship.register_value_model only accepts subclasses of django.db.models.Model') - - @staticmethod - def unregister_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name in Relationship._value_models: - Relationship._value_models.remove(model_name) - else: - raise TypeError('Relationship.unregister_value_model only accepts subclasses of django.db.models.Model') - entity_content_type = models.ForeignKey(ContentType, related_name='relationship_entity_set', verbose_name='Entity type') entity_object_id = models.PositiveIntegerField(verbose_name='Entity ID') entity = generic.GenericForeignKey('entity_content_type', 'entity_object_id') key = models.CharField(max_length=255) - value_content_type = models.ForeignKey(ContentType, related_name='relationship_value_set', limit_choices_to={'model__in':_value_models}, verbose_name='Value type') + value_content_type = models.ForeignKey(ContentType, related_name='relationship_value_set', verbose_name='Value type') value_object_id = models.PositiveIntegerField(verbose_name='Value ID') value = generic.GenericForeignKey('value_content_type', 'value_object_id') @@ -118,62 +105,55 @@ class Collection(models.Model): description = models.TextField(blank=True, null=True) +class CollectionMemberManager(models.Manager): + use_for_related_fields = True + + def with_model(self, model): + return model._default_manager.filter(pk__in=self.filter(member_content_type=ContentType.objects.get_for_model(model)).values_list('member_object_id', flat=True)) + + class CollectionMember(models.Model): - _value_models = [] - - @staticmethod - def register_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name not in CollectionMember._value_models: - CollectionMember._value_models.append(model_name) - else: - raise TypeError('CollectionMember.register_value_model only accepts subclasses of django.db.models.Model') - - @staticmethod - def unregister_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name in CollectionMember._value_models: - CollectionMember._value_models.remove(model_name) - else: - raise TypeError('CollectionMember.unregister_value_model only accepts subclasses of django.db.models.Model') - + objects = CollectionMemberManager() collection = models.ForeignKey(Collection, related_name='members') index = models.PositiveIntegerField(verbose_name='Index', help_text='This will determine the ordering of the item within the collection. (Optional)', null=True, blank=True) - member_content_type = models.ForeignKey(ContentType, limit_choices_to={'model__in':_value_models}, verbose_name='Member type') + member_content_type = models.ForeignKey(ContentType, verbose_name='Member type') member_object_id = models.PositiveIntegerField(verbose_name='Member ID') member = generic.GenericForeignKey('member_content_type', 'member_object_id') -def register_value_model(model): - Relationship.register_value_model(model) - CollectionMember.register_value_model(model) - - -def unregister_value_model(model): - Relationship.unregister_value_model(model) - CollectionMember.unregister_value_model(model) - - class TreeManager(models.Manager): use_for_related_fields = True def roots(self): return self.filter(parent__isnull=True) - def get_with_path(self, path, root=None, pathsep='/'): + def get_with_path(self, path, root=None, absolute_result=True, pathsep='/'): + """ + Returns the object with the path, or None if there is no object with that path, + unless absolute_result is set to False, in which case it returns a tuple containing + the deepest object found along the path, and the remainder of the path after that + object as a string (or None in the case that there is no remaining path). + """ slugs = path.split(pathsep) obj = root + remaining_slugs = list(slugs) + remainder = None for slug in slugs: + remaining_slugs.remove(slug) if slug: # ignore blank slugs, handles for multiple consecutive pathseps try: obj = self.get(slug__exact=slug, parent__exact=obj) except self.model.DoesNotExist: - obj = None + if absolute_result: + obj = None + remaining_slugs.insert(0, slug) + remainder = pathsep.join(remaining_slugs) break if obj: - return obj + if absolute_result: + return obj + else: + return (obj, remainder) raise self.model.DoesNotExist('%s matching query does not exist.' % self.model._meta.object_name) @@ -218,6 +198,15 @@ class TreeEntity(TreeModel, Entity): class Node(TreeEntity): instance_type = models.ForeignKey(ContentType, editable=False) + def get_path(self, pathsep='/', field='slug'): + path = getattr(self.instance, field) + parent = self.parent + while parent: + path = getattr(parent.instance, field) + pathsep + path + parent = parent.parent + return path + path = property(get_path) + def save(self, force_insert=False, force_update=False): if not hasattr(self, 'instance_type_ptr'): self.instance_type = ContentType.objects.get_for_model(self.__class__) @@ -233,13 +222,30 @@ class Node(TreeEntity): return HttpResponseServerError() +class MultiNode(Node): + accepts_subpath = True + + urlpatterns = [] + + def render_to_response(self, request, path=None, subpath=None): + if not subpath: + subpath = "" + subpath = "/" + subpath + from django.core.urlresolvers import resolve + view, args, kwargs = resolve(subpath, urlconf=self) + return view(request, *args, **kwargs) + + class Meta: + abstract = True + + class Redirect(Node): STATUS_CODES = ( (302, 'Temporary'), (301, 'Permanent'), ) target = models.URLField() - status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name="redirect type") + status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type') def render_to_response(self, request, path=None, subpath=None): response = HttpResponseRedirect(self.target)