X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3951a6f1b971ace912697f7229b71a55589b28b9..cf2b9630938e8c74f7037adacd2f5f0a4b6f2faa:/models.py?ds=inline diff --git a/models.py b/models.py index 64cf769..ecd1c1f 100644 --- a/models.py +++ b/models.py @@ -5,22 +5,20 @@ from django.contrib.contenttypes import generic from django.contrib.contenttypes.models import ContentType from django.db import models from django.contrib.sites.models import Site -from utils import fattr +from philo.utils import fattr from django.template import add_to_builtins as register_templatetags from django.template import Template as DjangoTemplate from django.template import TemplateDoesNotExist from django.template import Context, RequestContext from django.core.exceptions import ObjectDoesNotExist -try: - import json -except ImportError: - import simplejson as json +from django.utils import simplejson as json from UserDict import DictMixin -from templatetags.containers import ContainerNode +from philo.templatetags.containers import ContainerNode from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode from django.template.loader import get_template from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect from django.core.servers.basehttp import FileWrapper +from django.conf import settings def register_value_model(model): @@ -195,9 +193,18 @@ class TreeEntity(TreeModel, Entity): abstract = True -class Node(TreeEntity): +class InheritableTreeEntity(TreeEntity): instance_type = models.ForeignKey(ContentType, editable=False) + 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__) + super(InheritableTreeEntity, self).save(force_insert, force_update) + + @property + def instance(self): + return self.instance_type.get_object_for_this_type(id=self.id) + def get_path(self, pathsep='/', field='slug'): path = getattr(self.instance, field, '?') parent = self.parent @@ -207,15 +214,23 @@ class Node(TreeEntity): 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__) - super(Node, self).save(force_insert, force_update) - @property - def instance(self): - return self.instance_type.get_object_for_this_type(id=self.id) + def attributes(self): + if self.parent: + return QuerySetMapper(self.instance.attribute_set, passthrough=self.parent.instance.attributes) + return QuerySetMapper(self.instance.attribute_set) + + @property + def relationships(self): + if self.parent: + return QuerySetMapper(self.instance.relationship_set, passthrough=self.parent.instance.relationships) + return QuerySetMapper(self.instance.relationship_set) + class Meta: + abstract = True + + +class Node(InheritableTreeEntity): accepts_subpath = False def render_to_response(self, request, path=None, subpath=None): @@ -244,7 +259,7 @@ class Redirect(Node): (302, 'Temporary'), (301, 'Permanent'), ) - target = models.URLField() + target = models.URLField(help_text='Must be a valid, absolute URL (i.e. http://)') status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type') def render_to_response(self, request, path=None, subpath=None): @@ -268,8 +283,8 @@ class File(Node): class Template(TreeModel): name = models.CharField(max_length=255) documentation = models.TextField(null=True, blank=True) - mimetype = models.CharField(max_length=255, null=True, blank=True) - code = models.TextField() + mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE) + code = models.TextField(verbose_name='django template code') @property def origin(self): @@ -282,37 +297,46 @@ class Template(TreeModel): @property def containers(self): """ - Returns a list of names of contentlets referenced by containers. + Returns a tuple where the first item is a list of names of contentlets referenced by containers, + and the second item is a list of tuples of names and contenttypes of contentreferences referenced by containers. This will break if there is a recursive extends or includes in the template code. Due to the use of an empty Context, any extends or include tags with dynamic arguments probably won't work. """ - def container_node_names(template): - def nodelist_container_node_names(nodelist): - names = [] + def container_nodes(template): + def nodelist_container_nodes(nodelist): + nodes = [] for node in nodelist: try: - for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false'): + for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'): if hasattr(node, nodelist_name): - names.extend(nodelist_container_node_names(getattr(node, nodelist_name))) + nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name))) if isinstance(node, ContainerNode): - names.append(node.name) + nodes.append(node) elif isinstance(node, ExtendsNode): extended_template = node.get_parent(Context()) if extended_template: - names.extend(container_node_names(extended_template)) + nodes.extend(container_nodes(extended_template)) elif isinstance(node, ConstantIncludeNode): included_template = node.template if included_template: - names.extend(container_node_names(included_template)) + nodes.extend(container_nodes(included_template)) elif isinstance(node, IncludeNode): included_template = get_template(node.template_name.resolve(Context())) if included_template: - names.extend(container_node_names(included_template)) + nodes.extend(container_nodes(included_template)) except: pass # fail for this node - return names - return nodelist_container_node_names(template.nodelist) - return set(container_node_names(self.django_template)) + return nodes + return nodelist_container_nodes(template.nodelist) + all_nodes = container_nodes(self.django_template) + contentlet_node_names = set([node.name for node in all_nodes if not node.references]) + contentreference_node_names = [] + contentreference_node_specs = [] + for node in all_nodes: + if node.references and node.name not in contentreference_node_names: + contentreference_node_specs.append((node.name, node.references)) + contentreference_node_names.append(node.name) + return contentlet_node_names, contentreference_node_specs def __unicode__(self): return self.get_path(u' › ', 'name') @@ -328,6 +352,11 @@ class Template(TreeModel): class Page(Node): + """ + Represents an HTML page. The page will have a number of related Contentlets + depending on the template selected - but these will appear only after the + page has been saved with that template. + """ template = models.ForeignKey(Template, related_name='pages') title = models.CharField(max_length=255) @@ -349,6 +378,14 @@ class Contentlet(models.Model): dynamic = models.BooleanField(default=False) +class ContentReference(models.Model): + page = models.ForeignKey(Page, related_name='contentreferences') + name = models.CharField(max_length=255) + content_type = models.ForeignKey(ContentType, verbose_name='Content type') + content_id = models.PositiveIntegerField(verbose_name='Content ID') + content = generic.GenericForeignKey('content_type', 'content_id') + + register_templatetags('philo.templatetags.containers')