Index: openacs-4/packages/forums/lib/message/threads-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/threads-chunk-oracle.xql,v diff -u -N --- openacs-4/packages/forums/lib/message/threads-chunk-oracle.xql 22 Nov 2017 14:02:04 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ - - - oracle8.1.6 - - - - select fm.message_id, - fm.subject, - person.name(fm.user_id) as user_name, - to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - $replies as n_messages, - to_char(fm.last_child_post, 'YYYY-MM-DD HH24:MI:SS') as last_child_post_ansi - from forums_messages_approved fm - where fm.forum_id = :forum_id - and fm.parent_id is null - [template::list::orderby_clause -orderby -name "messages"] - - - - - - select fm.message_id, - fm.subject, - fm.last_poster as user_id, - person.name(fm.last_poster) as user_name, - to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - fm.state, - $replies as n_messages, - to_char(fm.last_child_post, 'YYYY-MM-DD HH24:MI:SS') as last_child_post_ansi, - u.screen_name, - $unread_or_new_query_clause - from forums_messages_approved fm $unread_join, users u - where fm.forum_id = :forum_id - and fm.user_id = u.user_id - and fm.parent_id is null - [template::list::page_where_clause -and -name messages -key fm.message_id] - [template::list::orderby_clause -orderby -name "messages"] - - - - Index: openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/threads-chunk-postgresql.xql,v diff -u -N --- openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql 22 Nov 2017 14:02:04 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ - - - postgresql7.1 - - - - select fm.message_id, - fm.subject, - person__name(fm.user_id) as user_name, - $replies as n_messages, - to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi - from forums_messages_approved fm - where fm.forum_id = :forum_id - and fm.parent_id is null - [template::list::orderby_clause -orderby -name messages] - - - - - - select fm.message_id, - fm.subject, - fm.last_poster as user_id, - person__name(fm.last_poster) as user_name, - to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - fm.state, - $replies as n_messages, - to_char(fm.last_child_post, 'YYYY-MM-DD HH24:MI:SS') as last_child_post_ansi, - u.screen_name, - $unread_or_new_query_clause - from forums_messages_approved fm $unread_join, - users u - where fm.forum_id = :forum_id - and fm.user_id = u.user_id - and fm.parent_id is null - [template::list::page_where_clause -and -name messages -key fm.message_id] - [template::list::orderby_clause -orderby -name messages] - - - - Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v diff -u -N -r1.28 -r1.29 --- openacs-4/packages/forums/lib/message/threads-chunk.tcl 9 May 2018 15:33:31 -0000 1.28 +++ openacs-4/packages/forums/lib/message/threads-chunk.tcl 11 Jun 2018 14:31:24 -0000 1.29 @@ -94,7 +94,7 @@ } state_pretty { label "\#forums.Moderate\#" - hide_p {[ad_decode $moderate_p 1 0 1]} + hide_p {[expr {$moderate_p ne 1}]} } user_name { label "#forums.Author#" @@ -131,8 +131,9 @@ } user_name { label "#forums.Author#" - orderby_asc_name "orderby_user_name_asc" - orderby_desc_name "orderby_user_name_desc" + orderby {(select first_names || last_name + from persons where person_id = fm.user_id)} + default_direction asc } n_messages { label "#forums.Replies#" @@ -145,14 +146,20 @@ set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] -db_multirow -extend { +db_multirow -extend { + user_name + screen_name last_child_post_pretty posting_date_pretty message_url user_url n_messages_pretty state_pretty } messages messages_select {} { + set user [acs_user::get -user_id $user_id] + set screen_name [dict get $user screen_name] + set user_name [dict get $user name] + set last_child_post_ansi [lc_time_system_to_conn $last_child_post_ansi] set last_child_post_pretty [lc_time_fmt $last_child_post_ansi "%x %X"] Index: openacs-4/packages/forums/lib/message/threads-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/forums/lib/message/threads-chunk.xql 22 Nov 2017 14:02:04 -0000 1.2 +++ openacs-4/packages/forums/lib/message/threads-chunk.xql 11 Jun 2018 14:31:24 -0000 1.3 @@ -1,17 +1,35 @@ - + - user_name desc + select fm.message_id, + fm.subject, + $replies as n_messages + from forums_messages_approved fm + where fm.forum_id = :forum_id + and fm.parent_id is null + [template::list::orderby_clause -orderby -name messages] - + - + - user_name asc + select fm.message_id, + fm.subject, + fm.last_poster as user_id, + to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, + fm.state, + $replies as n_messages, + to_char(fm.last_child_post, 'YYYY-MM-DD HH24:MI:SS') as last_child_post_ansi, + $unread_or_new_query_clause + from forums_messages_approved fm $unread_join + where fm.forum_id = :forum_id + and fm.parent_id is null + [template::list::page_where_clause -and -name messages -key fm.message_id] + [template::list::orderby_clause -orderby -name messages] - +