Index: openacs-4/packages/chat/www/moderator-grant-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/moderator-grant-oracle.xql,v diff -u -N --- openacs-4/packages/chat/www/moderator-grant-oracle.xql 14 Mar 2006 12:16:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ - - -oracle8.1.6 - - - - - select party_id, acs_object.name(party_id) as name - from parties - - - - - Index: openacs-4/packages/chat/www/moderator-grant-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/moderator-grant-postgresql.xql,v diff -u -N --- openacs-4/packages/chat/www/moderator-grant-postgresql.xql 14 Mar 2006 12:16:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ - - -postgresql7.1 - - - - select party_id, acs_object__name(party_id) as name - from parties - - - - Index: openacs-4/packages/chat/www/moderator-grant.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/moderator-grant.tcl,v diff -u -N -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/chat/www/moderator-grant.tcl 2 Mar 2019 17:51:10 -0000 1.6.2.2 +++ openacs-4/packages/chat/www/moderator-grant.tcl 3 Sep 2019 12:01:41 -0000 1.6.2.3 @@ -26,7 +26,10 @@ set r [::xo::db::Class get_instance_from_db -id $room_id] set room_name [$r set pretty_name] set description "[_ chat.Grant_moderator_for] $room_name [_ chat.to]" -db_multirow parties list_parties {} +db_multirow parties list_parties { + select party_id, acs_object.name(party_id) as name + from parties +} ad_return_template grant-entry Index: openacs-4/packages/notifications/www/manage-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage-oracle.xql,v diff -u -N --- openacs-4/packages/notifications/www/manage-oracle.xql 17 May 2003 10:54:55 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ - - - - oracle8.1.6 - - - - select request_id, - type_id, - (select pretty_name - from notification_types - where notification_types.type_id = - notification_requests.type_id) as type, - acs_object.name(notification_requests.object_id) as object_name, - (select name - from notification_intervals - where notification_intervals.interval_id = - notification_requests.interval_id) as interval, - object_id - from notification_requests - where user_id = :user_id - and dynamic_p = 'f' - - - - - Index: openacs-4/packages/notifications/www/manage-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage-postgresql.xql,v diff -u -N --- openacs-4/packages/notifications/www/manage-postgresql.xql 18 Jun 2018 15:03:46 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ - - - - postgresql7.1 - - - - select nr.request_id, - nr.type_id, - nt.pretty_name as type, - acs_object__name(nr.object_id) as object_name, - ni.name as interval, - nr.object_id - from notification_requests nr, - notification_intervals ni, - notification_types nt - where nr.user_id = :user_id - and nr.interval_id = ni.interval_id - and nr.type_id = nt.type_id - and nr.user_id is not null - and nr.dynamic_p = 'f' - order by lower(nt.pretty_name), object_name - - - - Index: openacs-4/packages/notifications/www/manage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.tcl,v diff -u -N -r1.14 -r1.14.2.1 --- openacs-4/packages/notifications/www/manage.tcl 27 Jun 2018 16:11:45 -0000 1.14 +++ openacs-4/packages/notifications/www/manage.tcl 3 Sep 2019 12:10:43 -0000 1.14.2.1 @@ -55,7 +55,23 @@ set return_url [ad_conn url] -db_multirow -extend { interval_url } notifications select_notifications {} { +db_multirow -extend { interval_url } notifications select_notifications { + select nr.request_id, + nr.type_id, + nt.pretty_name as type, + acs_object.name(nr.object_id) as object_name, + ni.name as interval, + nr.object_id + from notification_requests nr, + notification_intervals ni, + notification_types nt + where nr.user_id = :user_id + and nr.interval_id = ni.interval_id + and nr.type_id = nt.type_id + and nr.user_id is not null + and nr.dynamic_p = 'f' + order by lower(nt.pretty_name), object_name +} { set interval_url [export_vars -base request-change-frequency { request_id {return_url [ad_return_url]} }] set interval [_ notifications.${interval}] }