Adding fugue-icons submodule and adding django-staticmedia to the list of prerequisites.

[philo.git] / models / nodes.py

diff --git a/models/nodes.py b/models/nodes.py
index 1e7622a..23be42b 100644 (file)
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -4,11 +4,13 @@ from django.contrib.contenttypes import generic
 from django.contrib.sites.models import Site
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect
 from django.core.servers.basehttp import FileWrapper
 from django.contrib.sites.models import Site
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect
 from django.core.servers.basehttp import FileWrapper

-from django.core.urlresolvers import resolve
+from django.core.urlresolvers import resolve, clear_url_caches
+from django.template import add_to_builtins as register_templatetags

 from inspect import getargspec
 from inspect import getargspec

-from philo.models.base import TreeEntity, Entity, QuerySetMapper
+from philo.models.base import TreeEntity, Entity, QuerySetMapper, register_value_model

 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator
 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator

+from philo.exceptions import ViewDoesNotProvideSubpaths, AncestorDoesNotExist

 
 
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)
 
 
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)


@@ -21,11 +23,20 @@ class Node(TreeEntity):
        
        @property
        def accepts_subpath(self):
        
        @property
        def accepts_subpath(self):

-               return self.view.accepts_subpath
+               if self.view:
+                       return self.view.accepts_subpath
+               return False

        
        def render_to_response(self, request, path=None, subpath=None, extra_context=None):
                return self.view.render_to_response(self, request, path, subpath, extra_context)
        
        
        def render_to_response(self, request, path=None, subpath=None, extra_context=None):
                return self.view.render_to_response(self, request, path, subpath, extra_context)
        

+       def get_absolute_url(self):
+               root = Site.objects.get_current().root_node
+               try:
+                       return '/%s' % self.get_path(root=root)
+               except AncestorDoesNotExist:
+                       return None
+       

        class Meta:
                app_label = 'philo'
 
        class Meta:
                app_label = 'philo'
 


@@ -39,6 +50,9 @@ class View(Entity):
        
        accepts_subpath = False
        
        
        accepts_subpath = False
        

+       def get_subpath(self, obj):
+               raise ViewDoesNotProvideSubpaths
+       

        def attributes_with_node(self, node):
                return QuerySetMapper(self.attribute_set, passthrough=node.attributes)
        
        def attributes_with_node(self, node):
                return QuerySetMapper(self.attribute_set, passthrough=node.attributes)
        


@@ -61,16 +75,17 @@ class MultiView(View):
        urlpatterns = []
        
        def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
        urlpatterns = []
        
        def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):

+               clear_url_caches()

                if not subpath:
                        subpath = ""
                subpath = "/" + subpath
                view, args, kwargs = resolve(subpath, urlconf=self)
                if not subpath:
                        subpath = ""
                subpath = "/" + subpath
                view, args, kwargs = resolve(subpath, urlconf=self)

-               view_args = getargspec(view)[0]
-               if extra_context is not None and 'extra_context' in view_args:
+               view_args = getargspec(view)
+               if extra_context is not None and ('extra_context' in view_args[0] or view_args[2] is not None):

                        if 'extra_context' in kwargs:
                                extra_context.update(kwargs['extra_context'])
                        kwargs['extra_context'] = extra_context
                        if 'extra_context' in kwargs:
                                extra_context.update(kwargs['extra_context'])
                        kwargs['extra_context'] = extra_context

-               if 'node' in view_args:
+               if 'node' in view_args[0] or view_args[2] is not None:

                        kwargs['node'] = node
                return view(request, *args, **kwargs)
        
                        kwargs['node'] = node
                return view(request, *args, **kwargs)
        


@@ -111,4 +126,8 @@ class File(View):
                app_label = 'philo'
        
        def __unicode__(self):
                app_label = 'philo'
        
        def __unicode__(self):

-               return self.file.name
\ No newline at end of file
+               return self.file.name
+
+
+register_templatetags('philo.templatetags.nodes')
+register_value_model(Node)
\ No newline at end of file