Clarified error messages and docstrings in models/nodes.py. Removed an extraneous...

[philo.git] / models / nodes.py

diff --git a/models/nodes.py b/models/nodes.py
index de10ed1..526400c 100644 (file)
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -89,7 +89,7 @@ class View(Entity):
                return response
        
        def actually_render_to_response(self, request, extra_context=None):
                return response
        
        def actually_render_to_response(self, request, extra_context=None):

-               raise NotImplementedError('View subclasses must implement render_to_response.')
+               raise NotImplementedError('View subclasses must implement actually_render_to_response.')

        
        class Meta:
                abstract = True
        
        class Meta:
                abstract = True


@@ -102,7 +102,7 @@ class MultiView(View):
        accepts_subpath = True
        
        @property
        accepts_subpath = True
        
        @property

-       def urlpatterns(self, obj):
+       def urlpatterns(self):

                raise NotImplementedError("MultiView subclasses must implement urlpatterns.")
        
        def actually_render_to_response(self, request, extra_context=None):
                raise NotImplementedError("MultiView subclasses must implement urlpatterns.")
        
        def actually_render_to_response(self, request, extra_context=None):


@@ -127,6 +127,31 @@ class MultiView(View):
                        return '/%s/%s/' % (node.get_absolute_url().strip('/'), subpath.strip('/'))
                return subpath
        
                        return '/%s/%s/' % (node.get_absolute_url().strip('/'), subpath.strip('/'))
                return subpath
        

+       def get_context(self):
+               """Hook for providing instance-specific context - such as the value of a Field - to all views."""
+               return {}
+       
+       def basic_view(self, field_name):
+               """
+               Given the name of a field on ``self``, accesses the value of
+               that field and treats it as a ``View`` instance. Creates a
+               basic context based on self.get_context() and any extra_context
+               that was passed in, then calls the ``View`` instance's
+               render_to_response() method. This method is meant to be called
+               to return a view function appropriate for urlpatterns.
+               """
+               field = self._meta.get_field(field_name)
+               view = getattr(self, field.name, None)
+               
+               def inner(request, extra_context=None, **kwargs):
+                       if not view:
+                               raise Http404
+                       context = self.get_context()
+                       context.update(extra_context or {})
+                       return view.render_to_response(request, extra_context=context)
+               
+               return inner
+       

        class Meta:
                abstract = True
 
        class Meta:
                abstract = True
 


@@ -148,7 +173,6 @@ class Redirect(View):
                app_label = 'philo'
 
 
                app_label = 'philo'
 
 

-# Why does this exist?

 class File(View):
        """ For storing arbitrary files """
        
 class File(View):
        """ For storing arbitrary files """