Index: openacs-4/packages/project-manager/lib/groupmember-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/groupmember-list.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/project-manager/lib/groupmember-list.tcl 4 Oct 2005 15:31:38 -0000 1.1 +++ openacs-4/packages/project-manager/lib/groupmember-list.tcl 12 Oct 2005 18:23:52 -0000 1.2 @@ -11,7 +11,7 @@ set required_param_list [list group_name] set optional_param_list [list] -set optional_unset_list [list orderby customer_filter] +set optional_unset_list [list orderby customer_filter package_id] # Checking required parameters foreach required_param $required_param_list { @@ -55,12 +55,13 @@ # Get the group members list set group_members_list [group::get_members -group_id $group_id] +set customer_list {} # Get the customers list associated to this package_id -set customer_list [list] -db_foreach get_customers { } { - set customer_name [contact::name -party_id $customer_id] - lappend customer_list [list $customer_name $customer_id] -} +#set customer_list [list] +#db_foreach get_customers { } { +# set customer_name [contact::name -party_id $customer_id] +# lappend customer_list [list $customer_name $customer_id] +#} template::list::create \ -name members \ @@ -89,6 +90,9 @@ values { $customer_list } where_clause { customer_id = :customer_filter } } + package_id { + where_clause { proj.object_package_id = :package_id } + } } \ -orderby_name orderby \ -orderby { Index: openacs-4/packages/project-manager/tcl/install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/install-procs.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/project-manager/tcl/install-procs.tcl 12 Oct 2005 09:59:23 -0000 1.23 +++ openacs-4/packages/project-manager/tcl/install-procs.tcl 12 Oct 2005 18:23:53 -0000 1.24 @@ -54,8 +54,8 @@ # Create new relationship type for Application Links - # rel_types::new "application_link" "Application Link" "Application Links" apm_package 0 "" apm_package 0 "" - # rel_types::new "application_data_link" "Application Data Link" "Application Data Links" acs_object 0 "" acs_object 0 "" + rel_types::new "application_link" "Application Link" "Application Links" apm_package 0 "" apm_package 0 "" + rel_types::new "application_data_link" "Application Data Link" "Application Data Links" acs_object 0 "" acs_object 0 "" } ad_proc -private pm::install::package_instantiate {