Changeset 2027

Timestamp:

06/12/09 12:31:20 (9 months ago)

Author:

JensDiemer

Message:

add pagemeta to pylucid objects

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/system/pylucid_objects.py (modified) (2 diffs)
• apps/pylucid/views.py (modified) (2 diffs)
• tests/test_PluginAPI.py (modified) (1 diff)
• tests/unittest_plugin/views.py (modified) (2 diffs)

branches/0.9/pylucid_project/apps/pylucid/system/pylucid_objects.py

@@ -5 +5 @@
 
 class PyLucidRequestObjects(object):
-    """ PyLucid request objects """
+    """
+    PyLucid request objects
+    see also: http://www.pylucid.org/_goto/187/PyLucid-objects/
+    """
     def __init__(self):
         self.system_preferences = SystemPreferencesForm().get_preferences()
@@ -12 +15 @@
         self.default_lang_entry = Language.objects.get(code=default_lang_code)
         # objects witch will be set later:
-        #self.pagetree - The current page tree instance
+        #self.pagetree - The current PageTree model instance
+        #self.pagemeta - The current PageMeta model instance
         #self.pagecontent - PageContent instance, but only if the current page is not a PagePlugin!
         #self.lang_entry - The current language instance

branches/0.9/pylucid_project/apps/pylucid/views.py

@@ -80 +80 @@
     """ render a cms page """   
     request.PYLUCID.pagetree = pagetree
+
+    # Get the pagemeta instance for the current pagetree and language
+    pagemeta = PageTree.objects.get_pagemeta(request)
+    request.PYLUCID.pagemeta = pagemeta
     
     # Get template content and add it to PyLucid objects
@@ -85 +89 @@
     page_template, origin = loader.find_template_source(template_name)
     request.PYLUCID.page_template = page_template
-    
-    # Get the pagemeta instance for the current pagetree and language
-    pagemeta = PageTree.objects.get_pagemeta(request)
     
     # Create initial context object

branches/0.9/pylucid_project/tests/test_PluginAPI.py

@@ -197 +197 @@
                             " (site: %s, type: PluginPage)>"
                         ) % site.name,
+                        (
+                            "pagemeta: <PageMeta: PageMeta for page: '3-pluginpage'"
+                            " (lang: '%s')>"
+                        ) % language.code,
                         "system_preferences: {'lang_code': u'%s'}" % self.default_lang_code,
                     ),

branches/0.9/pylucid_project/tests/unittest_plugin/views.py

@@ -104 +104 @@
 
 def test_PyLucid_api(request):
-    """ Test the PyLucid API """
+    """
+    Test the PyLucid API
+    see also: http://www.pylucid.org/_goto/187/PyLucid-objects/
+    """
     request.page_msg(PLUGINPAGE_API_TEST_PAGE_MSG)
     
@@ -115 +118 @@
     output.append("page_template: %r" % request.PYLUCID.page_template)
     output.append("pagetree: %r" % request.PYLUCID.pagetree)
+    output.append("pagemeta: %r" % request.PYLUCID.pagemeta)
     output.append("system_preferences: %r" % request.PYLUCID.system_preferences)