[Collective-checkins] CMFBoard/uihelpers ui_get_forum_data.py,1.2,1.3 ui_get_topic_data.py,1.2,1.3

[Nikolay <faf...@pr...>]

Update of /cvsroot/collective/CMFBoard/uihelpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15427/uihelpers

Modified Files:
	ui_get_forum_data.py ui_get_topic_data.py 
Log Message:


Index: ui_get_topic_data.py
===================================================================
RCS file: /cvsroot/collective/CMFBoard/uihelpers/ui_get_topic_data.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ui_get_topic_data.py	28 Jan 2004 12:45:14 -0000	1.2
+++ ui_get_topic_data.py	28 Jan 2004 20:24:37 -0000	1.3
@@ -25,12 +25,45 @@
     data = {}
     topic_id = topic.getId()
     topic_uid = topic.UID()
+
+    # prev thread
+    # need add read status
+    topic_mod = topic.modified()
+    fcatalog = forum.forum_catalog
+    tp = fcatalog(modified={'query': (topic_mod,), 'range':'min'},
+                  sort_on='modified', sort_limit=2)
+    try:
+        ob = tp[1].getObject()
+        if ob.getId() == topic_id:
+            data['prev_topic_url'] = None
+        else:
+            data['prev_topic_url'] = ob.absolute_url()
+            data['prev_topic_title'] = ob.Title()
+    except:
+        pass
+    
+    # next thread
+    tp = fcatalog(modified={'query': (topic_mod,), 'range':'max'},
+                  sort_on='modified', sort_order='reverse', sort_limit=2)
+    try:
+        ob = tp[1].getObject()
+        if ob.getId() == topic_id:
+            data['next_topic_url'] = None
+        else:
+            data['next_topic_url'] = ob.absolute_url()
+            data['next_topic_title'] = ob.Title()
+    except:
+        pass
+    
+    # New topic link
+    if mtool.checkPermission(AddTopic, forum):
+        data['new_topic_url'] = '%s/forum_add_topic_form'%forum.absolute_url()
     
     try:
         session = request['SESSION']
     except:
         session = {}
-    
+   
     # sort mode
     name = '%s_sortmode'%topic_uid
     sort_mode = session.get(name, member.getProperty('fc_topic_sm', 'default'))

Index: ui_get_forum_data.py
===================================================================
RCS file: /cvsroot/collective/CMFBoard/uihelpers/ui_get_forum_data.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ui_get_forum_data.py	28 Jan 2004 12:45:14 -0000	1.2
+++ ui_get_forum_data.py	28 Jan 2004 20:24:36 -0000	1.3
@@ -164,13 +164,16 @@
             if hits_counter:
                 if hits >= topic_hot:
                     if brain.modified > topic_nr_date:
-                        icon = '%s_hot'%icon
+                        if replyCount:
+                            icon = '%s_hot'%icon
+                        else:
+                            icon = '%s_hot_noans'%icon
                     else:
                         icon = '%s_hot_noans'%icon
                 else:
                     if (brain.modified < topic_nr_date) or not replyCount:
                         icon = '%s_noans'%icon
-
+                        
         rec['icon'] = getattr(forum, '%s.gif'%icon, '')
 
         # pages links