diff -r 021e86368600 -r d3e545a8bd26 app/soc/logic/site/map.py --- a/app/soc/logic/site/map.py Tue Oct 21 01:22:36 2008 +0000 +++ b/app/soc/logic/site/map.py Wed Oct 22 06:19:12 2008 +0000 @@ -163,7 +163,7 @@ 'soc.views.models.docs.public'), 'Show Document', parent=home) - + # Site Document views site_docs_sub_menu = page.NonPage( 'site-docs-sub-menu', @@ -210,7 +210,7 @@ 'soc.views.models.sponsor.public'), 'Sponsor Public Profile', parent=home) - + # Sponsor Group Site views site_sponsor_sub_menu = page.NonPage( 'site-sponsor-sub-menu', @@ -258,11 +258,11 @@ # (r'^org/profile/(?P[_0-9a-z]+)/(?P[_0-9a-z]+)/$', # 'soc.views.person.profile.edit'), - + ROOT_PAGES = [ # /, first level of the sidebar menu, excluded from breadcrumbs home, - + # alternate view of /, no menu presence site_home, ] @@ -270,14 +270,14 @@ def getDjangoUrlPatterns(pages=ROOT_PAGES): """Returns Django urlpatterns derived from the site map Pages. - + Args: pages: a list of page.Page objects from which to generate urlpatterns (from them and from their child Pages); default is ROOT_PAGES Raises: KeyError if more than one Page has the same urlpattern. - + TODO(tlarsen): this probably does not work correctly, currently, since page.Page.makeDjangoUrls() returns a list, and this routine is combining lists from potentially multiple page hierarchies. Each list @@ -286,7 +286,7 @@ needs to be detected earlier via a global Page dictionary. """ urlpatterns = [''] - + for page in pages: urlpatterns.extend(page.makeDjangoUrls())