Merge branch 'master' of git@veekun.com:floof

[zzz-floof.git] / floof / lib / helpers.py

diff --git a/floof/lib/helpers.py b/floof/lib/helpers.py
index 28e9176..b4cac1f 100644 (file)
--- a/floof/lib/helpers.py
+++ b/floof/lib/helpers.py
@@ -8,6 +8,7 @@ available to Controllers. This module is available to both as 'h'.
 # from webhelpers.html.tags import checkbox, password
 from webhelpers import *
 from routes import url_for, redirect_to
 # from webhelpers.html.tags import checkbox, password
 from webhelpers import *
 from routes import url_for, redirect_to

+from pylons import url

 
 # Scaffolding helper imports
 from webhelpers.html.tags import *
 
 # Scaffolding helper imports
 from webhelpers.html.tags import *


@@ -30,3 +31,13 @@ def get_object_or_404(model, **kw):
         abort(404)
     return obj
 
         abort(404)
     return obj
 

+def get_comment_owner_url(**route):
+    """Given a view route, returns the owner_url route parameter for generating
+    comment URLs.
+    """ 
+    if 'owner_url' in route:
+        # We're already in a comments page.  Reuse the existing owner URL
+        return route['owner_url']
+
+    # url() returns URLs beginning with a slash.  We just need to strip it.
+    return url(**route)[1:]