Index: openacs-4/packages/simulation/lib/portfolio.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/portfolio.tcl,v diff -u -N -r1.10.2.3 -r1.10.2.4 --- openacs-4/packages/simulation/lib/portfolio.tcl 2 Nov 2006 10:44:12 -0000 1.10.2.3 +++ openacs-4/packages/simulation/lib/portfolio.tcl 10 Dec 2006 21:05:31 -0000 1.10.2.4 @@ -9,7 +9,7 @@ role_id {} deleted_p { default_value 0 } show_actions_p { default_value 1 } - portfolio_orderby { required_p 0 } + portfolio_orderby { default_value document_title } } @@ -45,7 +45,7 @@ document_title { label {[_ simulation.Document]} link_url_col document_url - orderby upper(cr.title) + orderby "upper(COALESCE(scrom.title, cr.title))" } publish_date { label {[_ simulation.Upload_date]} @@ -102,8 +102,7 @@ db_multirow -extend $extend documents select_documents " select scrom.object_id as document_id, ci.name as document_name, - scrom.title as scrom_title, - cr.title as document_title, + COALESCE(scrom.title, cr.title) as document_title, wr.pretty_name as role_name, cr.publish_date as publish_date, cr.mime_type, @@ -132,10 +131,6 @@ set delete [_ simulation.Delete] } - if { ![empty_string_p $scrom_title] } { - set document_title $scrom_title - } - set undelete_p $deleted_p set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/portfolio-delete" { case_id role_id document_id undelete_p}]