# HG changeset patch # User Sverre Rabbelier # Date 1232724778 0 # Node ID 5a10f6db154b37d7924c7320a5ab8cebb2bf68cd # Parent ca683f467bea750f17b6fa677a88eaea04493255 Hook up the 'home' view for site and program Also point to it in the sidebar's "home" link. Patch by: Sverre Rabbelier diff -r ca683f467bea -r 5a10f6db154b app/soc/views/helper/redirects.py --- a/app/soc/views/helper/redirects.py Fri Jan 23 15:31:13 2009 +0000 +++ b/app/soc/views/helper/redirects.py Fri Jan 23 15:32:58 2009 +0000 @@ -69,6 +69,13 @@ params['url_name'], entity.key().name()) +def getHomeRedirect(entity, params): + """Returns the home redirect for the specified entity + """ + + return '/%s/home/%s' % ( + params['url_name'], entity.key().name()) + def getReviewRedirect(entity, params): """Returns the redirect to review the specified entity """ diff -r ca683f467bea -r 5a10f6db154b app/soc/views/models/document.py --- a/app/soc/views/models/document.py Fri Jan 23 15:31:13 2009 +0000 +++ b/app/soc/views/models/document.py Fri Jan 23 15:32:58 2009 +0000 @@ -161,7 +161,7 @@ submenus = [] # add a link to the home page - submenu = (redirects.getPublicRedirect(entity, params), "Home", 'show') + submenu = (redirects.getHomeRedirect(entity, params), "Home", 'show') submenus.append(submenu) # add a link to all featured documents diff -r ca683f467bea -r 5a10f6db154b app/soc/views/models/presence.py --- a/app/soc/views/models/presence.py Fri Jan 23 15:31:13 2009 +0000 +++ b/app/soc/views/models/presence.py Fri Jan 23 15:32:58 2009 +0000 @@ -76,6 +76,15 @@ 'clean_feed_url': cleaning.clean_feed_url, } + patterns = [] + + page_name = "Home" + patterns += [(r'^%(url_name)s/(?Phome)/%(key_fields)s$', + 'soc.views.models.%(module_name)s.home', + page_name)] + + new_params['extra_django_patterns'] = patterns + params = dicts.merge(params, new_params, sub_merge=True) super(View, self).__init__(params=params) diff -r ca683f467bea -r 5a10f6db154b app/soc/views/models/program.py --- a/app/soc/views/models/program.py Fri Jan 23 15:31:13 2009 +0000 +++ b/app/soc/views/models/program.py Fri Jan 23 15:32:58 2009 +0000 @@ -153,4 +153,4 @@ list = view.list public = view.public export = view.export - +home = view.home diff -r ca683f467bea -r 5a10f6db154b app/soc/views/models/site.py --- a/app/soc/views/models/site.py Fri Jan 23 15:31:13 2009 +0000 +++ b/app/soc/views/models/site.py Fri Jan 23 15:32:58 2009 +0000 @@ -153,4 +153,4 @@ export = view.export main_public = view.mainPublic main_edit = view.mainEdit - +home = view.home