Adding __unicode__ to BlogViews.

[philo.git] / models / nodes.py

diff --git a/models/nodes.py b/models/nodes.py
index 9eb2bd0..a8125ee 100644 (file)
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -4,6 +4,8 @@ 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 inspect import getargspec

 from philo.models.base import TreeEntity, Entity, QuerySetMapper
 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator
 from philo.models.base import TreeEntity, Entity, QuerySetMapper
 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator


@@ -48,7 +50,6 @@ class View(Entity):
        
        class Meta:
                abstract = True
        
        class Meta:
                abstract = True

-               app_label = 'philo'

 
 
 _view_content_type_limiter.cls = View
 
 
 _view_content_type_limiter.cls = View


@@ -63,13 +64,18 @@ class MultiView(View):
                if not subpath:
                        subpath = ""
                subpath = "/" + subpath
                if not subpath:
                        subpath = ""
                subpath = "/" + subpath

-               from django.core.urlresolvers import resolve

                view, args, kwargs = resolve(subpath, urlconf=self)
                view, args, kwargs = resolve(subpath, urlconf=self)

+               view_args = getargspec(view)[0]
+               if extra_context is not None and 'extra_context' in view_args:
+                       if 'extra_context' in kwargs:
+                               extra_context.update(kwargs['extra_context'])
+                       kwargs['extra_context'] = extra_context
+               if 'node' in view_args:
+                       kwargs['node'] = node

                return view(request, *args, **kwargs)
        
        class Meta:
                abstract = True
                return view(request, *args, **kwargs)
        
        class Meta:
                abstract = True

-               app_label = 'philo'

 
 
 class Redirect(View):
 
 
 class Redirect(View):