Index: openacs-4/packages/contacts/lib/contact-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/contacts/lib/contact-master.tcl 16 Feb 2006 14:07:11 -0000 1.15 +++ openacs-4/packages/contacts/lib/contact-master.tcl 4 Mar 2006 22:58:41 -0000 1.16 @@ -17,17 +17,13 @@ set user_id [ad_conn user_id] set package_id [ad_conn package_id] set package_url [ad_conn package_url] -set tasks_url [site_node::get_package_url -package_key "tasks"] + set page_url [ad_conn url] set page_query [ad_conn query] set title $name set context [list $name] -if {![empty_string_p $tasks_url]} { - set prefix "/contacts/${party_id}/" -} else { - set prefix "${package_url}${party_id}/" -} +set prefix "${package_url}${party_id}/" set link_list [list] @@ -44,9 +40,11 @@ lappend link_list "${prefix}files" lappend link_list "[_ contacts.Files]" - if {![empty_string_p $tasks_url]} { + # this should be taken care of by a callback instead of embedding + # it in this contacts page... + if { [string is true [apm_package_enabled_p tasks]] } { lappend link_list "${prefix}history" "[_ contacts.History]" - lappend link_list "/tasks/contact" "[_ contacts.Tasks]" + lappend link_list "${prefix}tasks" "[_ contacts.Tasks]" } lappend link_list "${prefix}message"