Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/index-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/index-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/general-comments/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/general-comments/www/index.tcl	7 Aug 2017 23:48:12 -0000	1.10
+++ openacs-4/packages/general-comments/www/index.tcl	13 Jun 2018 13:40:24 -0000	1.11
@@ -52,7 +52,8 @@
     -html {style "margin: 0 auto"} \
     -elements {
 	counter {
-	    label "#general-comments.Num#" 
+	    label "#general-comments.Num#"
+            display_template {@comments.rownum;literal@}
 	}
         comment_id {
 	    label "#general-comments.ID#"
@@ -79,20 +80,18 @@
 	} 
     } -filters {approval {} modified {}} 
 
-set count 0
-db_multirow -extend {user_id return_url counter pretty_date} comments comments_select {} {
-    set counter [incr count]
+set yes [_ acs-kernel.common_Yes]
+set no  [_ acs-kernel.common_No]
+
+db_multirow -extend {user_id return_url pretty_date} comments comments_select {} {
+    set live_version_p [expr {$live_version_p ? $yes : $no}]
+    set approved_p [expr {$approved_p ? $yes : $no}]
     set pretty_date [lc_time_fmt $creation_date "%x %X"]
-    set approved_p [util_PrettyTclBoolean $approved_p]
-    set live_version_p [util_PrettyTclBoolean $live_version_p]
 }
 
-set page_title "[_ general-comments.General_Comments]"
+set page_title [_ general-comments.General_Comments]
 set context {}
 
-ad_return_template
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/general-comments/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/index.xql	22 Nov 2017 14:13:32 -0000	1.2
+++ openacs-4/packages/general-comments/www/index.xql	13 Jun 2018 13:40:24 -0000	1.3
@@ -40,5 +40,27 @@
       
     </querytext>
   </partialquery>
+
+  <fullquery name="comments_select">
+    <querytext>
+     select g.comment_id,
+            r.title, 
+            i.live_revision is not null as live_version_p,
+            i.live_revision is not null and
+               i.live_revision = r.revision_id as approved_p,
+            o.creation_date
+      from general_comments g,
+           cr_items i,
+           cr_revisions r,
+           acs_objects o
+     where g.comment_id = i.item_id and
+           r.revision_id = o.object_id and
+           r.revision_id = i.latest_revision and 
+           o.creation_user = :user_id
+          [ad_dimensional_sql $dimensional]
+     [template::list::orderby_clause -orderby -name comments_list]
+    </querytext>
+  </fullquery>
   
+  
 </queryset>