Index: openacs-4/packages/project-manager/lib/projects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.tcl,v diff -u -N -r1.30 -r1.31 --- openacs-4/packages/project-manager/lib/projects.tcl 18 Nov 2005 17:17:35 -0000 1.30 +++ openacs-4/packages/project-manager/lib/projects.tcl 18 Nov 2005 17:22:06 -0000 1.31 @@ -21,6 +21,7 @@ set optional_unset_list [list assignee_id date_range is_observer_p previous_status_f current_package_f subprojects_p] set dotlrn_installed_p [apm_package_installed_p dotlrn] set invoice_installed_p [apm_package_installed_p dotlrn-invoices] +set contacts_installed_p [apm_package_installed_p contacts] set user_id [ad_conn user_id] foreach required_param $required_param_list { @@ -195,8 +196,16 @@ if {$actions_p == 1} { - set actions [list "[_ project-manager.Add_project]" "[export_vars -base "${base_url}add-edit" -url {customer_id}]" "[_ project-manager.Add_project]" "[_ project-manager.Customers]" "[site_node::get_package_url -package_key contacts]" "[_ project-manager.View_customers]"] + set actions [list "[_ project-manager.Add_project]" "[export_vars -base "${base_url}add-edit" -url {customer_id}]" "[_ project-manager.Add_project]"] + + if {$contacts_installed_p} { + set customer_url [site_node::get_package_url -package_key contacts] + } else { + set customer_url [site_node::get_package_url -package_key organizations] + } + lappend actions "[_ project-manager.Customers]" $customer_url "[_ project-manager.View_customers]" + if {$invoice_installed_p} { lappend actions "[_ project-manager.Projects_reports]" "reports" "[_ project-manager.Projects_reports]" }