Index: openacs.org-dev/packages/forums/www/forum-view-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs.org-dev/packages/forums/www/forum-view-postgresql.xql 5 Sep 2002 17:27:48 -0000 1.3 +++ openacs.org-dev/packages/forums/www/forum-view-postgresql.xql 20 Sep 2002 00:55:52 -0000 1.4 @@ -11,7 +11,7 @@ fm.posting_date, fm.state, (select count(*) - from forums_messages_approved fm1 + from $forums_table fm1 where fm1.forum_id = :forum_id and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages, to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified, @@ -25,7 +25,7 @@ - + select fm.message_id, fm.subject, @@ -34,7 +34,7 @@ fm.posting_date, fm.state, (select count(*) - from forums_messages fm1 + from $forums_table fm1 where fm1.forum_id = :forum_id and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages, to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified, @@ -44,8 +44,9 @@ where fm.forum_id = :forum_id and fm.parent_id is null and fm.message_id = acs_objects.object_id + and fm.message_id IN (CURRENT_PAGE_SET) order by fm.posting_date desc - + Index: openacs.org-dev/packages/forums/www/forum-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view.adp,v diff -u -r1.5 -r1.6 --- openacs.org-dev/packages/forums/www/forum-view.adp 5 Sep 2002 17:27:48 -0000 1.5 +++ openacs.org-dev/packages/forums/www/forum-view.adp 20 Sep 2002 00:55:52 -0000 1.6 @@ -41,23 +41,17 @@ Index: openacs.org-dev/packages/forums/www/forum-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view.tcl,v diff -u -r1.4 -r1.5 --- openacs.org-dev/packages/forums/www/forum-view.tcl 5 Sep 2002 17:27:48 -0000 1.4 +++ openacs.org-dev/packages/forums/www/forum-view.tcl 20 Sep 2002 00:55:52 -0000 1.5 @@ -59,13 +59,14 @@ } set query messages_select - +set forums_table forums_messages_approved if {$moderate_p} { - set query messages_select_moderator +# set query messages_select_moderator + set forums_table forums_messages } # paginator stuff -paginator create $query paginated_messages "$forum(name)" -pagesize 30 -groupsize 10 -contextual +paginator create $query paginated_messages $forum(name) -pagesize 30 -groupsize 10 -contextual paginator get_data display_data paginated_messages messages "" message_id $page
- - - < -
-
-   - + - Previous 10 + Previous 10
- Previous + < Previous     @@ -71,24 +65,20 @@   - Next - + Next + > +
 
- - - > -
-
-   +    - Next 10 + Next 10