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

[zzz-floof.git] / floof / config / routing.py

diff --git a/floof/config/routing.py b/floof/config/routing.py
index 603afd0..645d138 100644 (file)
--- a/floof/config/routing.py
+++ b/floof/config/routing.py
@@ -49,10 +49,10 @@ def make_map():
     # Comments
     with map.submapper(controller='comments') as sub:
         sub.connect('/*owner_url/comments', action='thread')
     # Comments
     with map.submapper(controller='comments') as sub:
         sub.connect('/*owner_url/comments', action='thread')

-        sub.connect('/*owner_url/comments/{id}', action='thread')

         sub.connect('/*owner_url/comments/reply', action='reply')
         sub.connect('/*owner_url/comments/reply', action='reply')

-        sub.connect('/*owner_url/comments/{id}/reply', action='reply')

         sub.connect('/*owner_url/comments/reply_done', action='reply_done', **require_POST)
         sub.connect('/*owner_url/comments/reply_done', action='reply_done', **require_POST)

+        sub.connect('/*owner_url/comments/{id}', action='thread')
+        sub.connect('/*owner_url/comments/{id}/reply', action='reply')

         sub.connect('/*owner_url/comments/{id}/reply_done', action='reply_done', **require_POST)
 
     with map.submapper(controller="art") as sub:
         sub.connect('/*owner_url/comments/{id}/reply_done', action='reply_done', **require_POST)
 
     with map.submapper(controller="art") as sub: