Index: openacs-4/packages/contacts/lib/contact-complaint-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/contacts/lib/contact-complaint-list.tcl 4 Oct 2005 21:33:01 -0000 1.7 +++ openacs-4/packages/contacts/lib/contact-complaint-list.tcl 5 Oct 2005 08:42:13 -0000 1.8 @@ -34,8 +34,12 @@ display_template \ " @complaint.title@"] \ - customer [list label [_ contacts.Customer]]\ - supplier [list label [_ contacts.Supplier]]\ + customer [list label [_ contacts.Customer] \ + display_template \ + "@complaint.customer@"]\ + supplier [list label [_ contacts.Supplier] \ + display_template \ + "@complaint.supplier@"]\ turnover [list label [_ contacts.Turnover]]\ percent [list label [_ contacts.Percent]]\ state [list label "[_ contacts.Status]:"]\ @@ -96,8 +100,9 @@ } -db_multirow -extend { customer supplier title description } complaint get_complaints { } { +db_multirow -extend { customer customer_url supplier supplier_url } complaint get_complaints { } { set customer "[contact::name -party_id $customer_id]" set supplier "[contact::name -party_id $supplier_id]" - db_1row get_revision_info { } + set customer_url "/contacts/$customer_id" + set supplier_url "/contacts/$supplier_id" } Index: openacs-4/packages/contacts/lib/contact-complaint-list.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/contacts/lib/contact-complaint-list.xql 11 Aug 2005 14:14:58 -0000 1.2 +++ openacs-4/packages/contacts/lib/contact-complaint-list.xql 5 Oct 2005 08:42:13 -0000 1.3 @@ -5,11 +5,12 @@ select - cct.* + cct.*, cr.title, cr.description from - contact_complaint_tracking cct, cr_items ci + contact_complaint_tracking cct, cr_items ci, cr_revisions cr where ci.latest_revision = cct.complaint_id + and cr.revision_id = cct.complaint_id [template::list::filter_where_clauses -and -name complaint]