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.34 -r1.35
--- openacs-4/packages/project-manager/lib/projects.tcl	5 Apr 2006 15:09:05 -0000	1.34
+++ openacs-4/packages/project-manager/lib/projects.tcl	10 May 2006 18:51:41 -0000	1.35
@@ -18,7 +18,7 @@
 set required_param_list "package_id"
 set optional_param_list [list orderby pm_status_id searchterm bulk_p action_p page_num page_size\
 			     filter_p base_url end_date_f user_space_p hidden_vars]
-set optional_unset_list [list assignee_id pm_etat_id pm_contact_id date_range is_observer_p previous_status_f current_package_f subprojects_p]
+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]
@@ -64,7 +64,7 @@
 # initialize the pa_from_clause. It should be empty unless needed
 set pa_from_clause ""
 
-if [empty_string_p $user_space_p] {
+if {[empty_string_p $user_space_p] && $dotlrn_installed_p} {
     set user_space_p 0
     set dotlrn_club_id [dotlrn_community::get_community_id]
     set pm_package_id [dotlrn_community::get_package_id_from_package_key \
@@ -235,22 +235,12 @@
 }
 
 # If this filter is provided we can see all projects for a given contact
-set organization_id [lindex [application_data_link::get_linked -from_object_id [dotlrn_community::get_community_id] -to_object_type "organization"] 0]
-set contact_filter [lrange [wieners::get_contacts -customer_id $organization_id] 1 end]
-if { [exists_and_not_null pm_contact_id] } {
-    set contact_where_clause "p.contact_id = :pm_contact_id"
+if {$dotlrn_installed_p} {
+    set organization_id [lindex [application_data_link::get_linked -from_object_id [dotlrn_community::get_community_id] -to_object_type "organization"] 0]
 } else {
-    set contact_where_clause ""
+    set organization_id ""
 }
 
-# If this filter is provided we can see all projects for a given etat
-set etat_filter [lrange [wieners::get_etats -customer_id $organization_id] 1 end]
-if { [exists_and_not_null pm_etat_id] } {
-    set etat_where_clause "p.etat_id = :pm_etat_id"
-} else {
-    set etat_where_clause ""
-}
-
 # If this filter is provided we can watch the projects in 
 # all project manager instances
 if { [exists_and_not_null current_package_f] } {
@@ -319,16 +309,6 @@
 				values { {All "-1"} [pm::status::project_status_select]} \
 				where_clause { $status_where_clause } \
 			       ] \
-		 pm_contact_id [list \
-				  label "[_ acs-translations.pm_project_contact_id]" \
-				  values { $contact_filter } \
-				  where_clause {$contact_where_clause} 
-			     ] \
-		 pm_etat_id [list \
-				  label "[_ acs-translations.pm_project_etat_id]" \
-				  values { $etat_filter } \
-				  where_clause {$etat_where_clause} 
-			     ] \
 		 assignee_id [list \
 				  label "[_ project-manager.Assignee]" \
 				  default_value $user_id \
@@ -379,14 +359,6 @@
 <if @projects.customer_id@ not nil>$contact_column</if><else>@projects.customer_name@</else>
 "
 	}
-	contact_id {
-	    label "[_ acs-translations.pm_project_contact_id]"
-	    display_template {<if @projects.contact_id@ not nil><a href="@projects.contact_url@">@projects.contact_name@</a></if><else>&nbsp;</else>}
-	}
-	etat_id {
-	    label "[_ acs-translations.pm_project_etat_id]"
-	    display_template {<if @projects.etat_id@ not nil><a href="@projects.etat_url@">@projects.etat_name@</a></if><else>&nbsp;</else>}
-	}
 	creation_date {
 	    label "[_ project-manager.Creation_date]"
             display_template "@projects.creation_date_lc@"
@@ -504,17 +476,12 @@
 	width 100%
     }
 
-db_multirow -extend { item_url customer_url category_select earliest_finish_date latest_finish_date start_date_lc earliest_start_date creation_date_lc planned_end_date_lc etat_name etat_url contact_name contact_url} projects project_folders " " {
+db_multirow -extend { item_url customer_url category_select earliest_finish_date latest_finish_date start_date_lc earliest_start_date creation_date_lc planned_end_date_lc} projects project_folders " " {
     set earliest_finish_date [lc_time_fmt $earliest_finish_date $fmt]
     set latest_finish_date [lc_time_fmt $latest_finish_date $fmt]
     set creation_date_lc [lc_time_fmt $creation_date $fmt]
     set start_date_lc [lc_time_fmt $start_date "%x"]
     set planned_end_date_lc [lc_time_fmt $planned_end_date $fmt]
-    set etat_name [contact::name -party_id $etat_id]
-    set etat_url "/contacts/$etat_id"
-    set contact_name [contact::name -party_id $contact_id -reverse_order]
-    set contact_url "/contacts/$contact_id"
-        
     set _base_url [site_node::get_url_from_object_id -object_id $package_id]
     if {![empty_string_p $_base_url]} {
 	set base_url $_base_url