Index: openacs-4/packages/project-manager/lib/assignee-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/assignee-portlet.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/project-manager/lib/assignee-portlet.tcl 26 Aug 2005 20:59:12 -0000 1.5 +++ openacs-4/packages/project-manager/lib/assignee-portlet.tcl 9 Sep 2005 22:31:42 -0000 1.6 @@ -24,6 +24,9 @@ # Get the URL for contacts set contacts_url [site_node::get_package_url -package_key contacts] +# Check if contacts is installed +set contacts_installed_p [apm_package_installed_p contacts] + # Send Email URL set send_email_url "send-mail?project_id=$project_id" @@ -66,14 +69,19 @@ ] \ role_name [list \ label "[_ project-manager.Role]" \ - ] \ - complaint [list \ - label "[_ contacts.Complaint]" \ - display_template {[_ project-manager.Add_complaint] - } \ - ] \ - ] + ] + ] +if {$contacts_installed_p} { + lappend elements [list \ + complaint [list \ + label "[_ contacts.Complaint]" \ + display_template {[_ project-manager.Add_complaint] + } \ + ] \ + ] +} + template::list::create \ -name people \ -multirow people \ Index: openacs-4/packages/project-manager/lib/project-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/project-portlet.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/project-manager/lib/project-portlet.tcl 31 Aug 2005 09:45:16 -0000 1.14 +++ openacs-4/packages/project-manager/lib/project-portlet.tcl 9 Sep 2005 22:31:42 -0000 1.15 @@ -18,6 +18,9 @@ set default_layout_url [parameter::get -parameter DefaultPortletLayoutP] +# Check if contacts is installed +set contacts_installed_p [apm_package_installed_p contacts] + #URL to rate this project set rate_url "rate-project?project_id=$project_id&project_item_id=$project_item_id" @@ -46,7 +49,7 @@ set project(status_pretty) [pm::project::get_status_description -project_item_id $project_item_id] set contacts_url [apm_package_url_from_key contacts] -if {![empty_string_p contacts_url]} { +if {![empty_string_p contacts_url] && $contacts_installed_p} { set project(customer_name) [contact::name -party_id $project(customer_id)] } else { set project(customer_name) "" 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 -r1.19 -r1.20 --- openacs-4/packages/project-manager/lib/projects.tcl 7 Sep 2005 14:27:40 -0000 1.19 +++ openacs-4/packages/project-manager/lib/projects.tcl 9 Sep 2005 22:31:42 -0000 1.20 @@ -9,6 +9,7 @@ set optional_param_list [list orderby status_id searchterm bulk_p action_p \ filter_p base_url end_date_f user_space_p hidden_vars] set optional_unset_list [list assignee_id date_range is_observer_p] +set dotlrn_installed_p [apm_package_installed_p dotlrn] set user_id [ad_conn user_id] foreach required_param $required_param_list { @@ -355,14 +356,16 @@ set item_url [export_vars -base "${base_url}one" {project_item_id}] - set community_id [dotlrn_community::get_community_id_from_url -url $base_url] + if {$dotlrn_installed_p} { + set community_id [dotlrn_community::get_community_id_from_url -url $base_url] - if { ![empty_string_p $community_id] } { - set community_name [dotlrn_community::get_community_name $community_id] - set portal_info_name "Project: $community_name" - set portal_info_url "$base_url" + if { ![empty_string_p $community_id] } { + set community_name [dotlrn_community::get_community_name $community_id] + set portal_info_name "Project: $community_name" + set portal_info_url "$base_url" } + } # root CR folder set root_folder [pm::util::get_root_folder -package_id $package_id] Index: openacs-4/packages/project-manager/templates/project-one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/project-manager/templates/project-one.adp 4 Sep 2005 12:25:26 -0000 1.8 +++ openacs-4/packages/project-manager/templates/project-one.adp 9 Sep 2005 22:31:42 -0000 1.9 @@ -46,10 +46,12 @@ fmt=@fmt@ />

+

+