[Mpuls-commits] r888 - wasko/branches/2.0/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-01-26 15:05:57 +0100 (Tue, 26 Jan 2010)
New Revision: 888

Modified:
   wasko/branches/2.0/waskaweb/lib/helpers.py
Log:
* waskaweb/lib/helpers.py (render_navigation): Removed. Is now imported from lib.navigation



Modified: wasko/branches/2.0/waskaweb/lib/helpers.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/helpers.py	2010-01-26 14:04:43 UTC (rev 887)
+++ wasko/branches/2.0/waskaweb/lib/helpers.py	2010-01-26 14:05:57 UTC (rev 888)
@@ -43,7 +43,7 @@
 from webhelpers import *
 
 from waskaweb.lib.filecache import FileCache
-from waskaweb.lib.navigation import get_pagename 
+from waskaweb.lib.navigation import get_pagename, render_navigation
 
 
 PRINTABLE = frozenset(printable)
@@ -51,18 +51,6 @@
 log = logging.getLogger(__name__)
 
 
-def render_navigation(mode="r"):
-    tree = session['navigation.tree']
-    #factory = InstanceFactory(g.formed, PostgresDBInterface())
-    #instance_tree = factory.loadInstanceTreeByIdentifier(
-    #    id,
-    #    session.get('uncommited_fields'))
-    #errors = {} #instance_tree.getErrors()
-    #error_pages = set([page for page in errors.iterkeys()])
-    error_pages = set()
-    return tree.render(tree.root, FileCache(), error_pages)
-
-
 # map old role names to the newer non-application-specific names
 _old_role_names = {
     'cm_ka': 'cm',