Populate those empty "activity" and "volume" columns. Show last posts. #315

[zzz-spline-forum.git] / splinext / forum / __init__.py

diff --git a/splinext/forum/__init__.py b/splinext/forum/__init__.py
index 6914409..974e29e 100644 (file)
--- a/splinext/forum/__init__.py
+++ b/splinext/forum/__init__.py
@@ -1,6 +1,6 @@
 from pkg_resources import resource_filename
 
 from pkg_resources import resource_filename
 

-from pylons import c, session
+from pylons import session, tmpl_context as c

 
 from spline.lib.plugin import PluginBase
 from spline.lib.plugin import PluginBase, PluginLink, Priority
 
 from spline.lib.plugin import PluginBase
 from spline.lib.plugin import PluginBase, PluginLink, Priority


@@ -12,10 +12,11 @@ def add_routes_hook(map, *args, **kwargs):
     require_POST = dict(conditions=dict(method=['POST']))
 
     map.connect('/forums', controller='forum', action='forums')
     require_POST = dict(conditions=dict(method=['POST']))
 
     map.connect('/forums', controller='forum', action='forums')

-    map.connect('/forums/{forum_id}', controller='forum', action='threads')
-    map.connect('/forums/{forum_id}/threads/{thread_id}', controller='forum', action='posts')
+    map.connect(r'/forums/{forum_id:\d+}', controller='forum', action='threads')
+    map.connect(r'/forums/{forum_id:\d+}/threads/{thread_id:\d+}', controller='forum', action='posts')

 
 

-    map.connect('/forums/{forum_id}/threads/{thread_id}/write', controller='forum', action='write')
+    map.connect(r'/forums/{forum_id:\d+}/write', controller='forum', action='write_thread')
+    map.connect(r'/forums/{forum_id:\d+}/threads/{thread_id:\d+}/write', controller='forum', action='write')

 
 
 class ForumPlugin(PluginBase):
 
 
 class ForumPlugin(PluginBase):


@@ -25,6 +26,16 @@ class ForumPlugin(PluginBase):
         )
 
     def hooks(self):
         )
 
     def hooks(self):

-        return [
+        hooks = [

             ('routes_mapping',    Priority.NORMAL,      add_routes_hook),
         ]
             ('routes_mapping',    Priority.NORMAL,      add_routes_hook),
         ]

+
+        # frontpage plugin may or may not be installed
+        try:
+            from splinext.forum.frontpage_sources import ForumSource
+            hooks.append(
+                ('frontpage_updates_forum', Priority.NORMAL, ForumSource))
+        except ImportError:
+            pass
+
+        return hooks