Index: openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml,v diff -u -r1.11 -r1.12 --- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml 17 Jun 2005 09:26:59 -0000 1.11 +++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml 21 Jun 2005 22:16:39 -0000 1.12 @@ -1,5 +1,5 @@ - + --- TBD --- -- Closed Index: openacs-4/packages/project-manager/lib/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/project-manager/lib/tasks.tcl 17 Jun 2005 10:28:10 -0000 1.6 +++ openacs-4/packages/project-manager/lib/tasks.tcl 21 Jun 2005 22:16:39 -0000 1.7 @@ -4,7 +4,7 @@ set required_param_list [list] set optional_param_list [list orderby searchterm status_id page bulk_p actions_p base_url] -set optional_unset_list [list party_id role_id project_item_id] +set optional_unset_list [list party_id role_id project_item_id instance_id] foreach required_param $required_param_list { if {![info exists $required_param]} { @@ -152,8 +152,11 @@ label "[_ project-manager.Project_1]" \ values {[pm::project::get_list_of_open]} \ where_clause "t.parent_id = :project_item_id" - ] - ] + ] \ + instance_id [list \ + where_clause "p.parent_id = :instance_id" + ] \ + ] foreach element $elements { Index: openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl 16 Jun 2005 07:42:39 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/project-manager-callback-procs.tcl 21 Jun 2005 22:16:39 -0000 1.3 @@ -114,18 +114,21 @@ {-package_id:required} {-form:required} {-object_type:required} + {-party_id} } { If organisation, ask to create new project } { - if {[llength [application_link::get_linked \ - -from_package_id $package_id \ - -to_package_key "project-manager"]] > 0} { - if {$object_type != "person" } { - ad_form -extend -name $form -form { - {create_project_p:text(radio) \ - {label "[_ project-manager.create_project]"} \ - {options {{[_ acs-kernel.common_Yes] "t"} {[_ acs-kernel.common_no] "f"}}} \ - {values "f"} + if {![exists_and_not_null party_id]} { + if {[llength [application_link::get_linked \ + -from_package_id $package_id \ + -to_package_key "project-manager"]] > 0} { + if {$object_type != "person" } { + ad_form -extend -name $form -form { + {create_project_p:text(radio) \ + {label "[_ project-manager.create_project]"} \ + {options {{[_ acs-kernel.common_Yes] "t"} {[_ acs-kernel.common_no] "f"}}} \ + {values "f"} + } } } } Index: openacs-4/packages/project-manager/www/add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/add-edit.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/project-manager/www/add-edit.tcl 21 Jun 2005 21:31:02 -0000 1.11 +++ openacs-4/packages/project-manager/www/add-edit.tcl 21 Jun 2005 22:16:39 -0000 1.12 @@ -109,7 +109,7 @@ {customer_id:text(select),optional {label "[_ project-manager.Customer]"} - {options {{"[_ project-manager.---_TBD_---]" ""} [db_list_of_lists get_customer "select o.name, o.organization_id from organizations o order by o.name"]}} + {options {{"[_ project-manager.---_TBD_---]" ""} [lang::util::localize_list_of_lists -list [db_list_of_lists get_customer "select o.name, o.organization_id from organizations o order by o.name"]]}} } {planned_start_date:text(text) @@ -142,7 +142,7 @@ {status_id:text(select) {label "[_ project-manager.Status_1]"} - {options {[db_list_of_lists get_status_codes { }]}} + {options {[lang::util::localize_list_of_lists -list [db_list_of_lists get_status_codes { }]]}} } {variables:text(multiselect),multiple Index: openacs-4/packages/project-manager/www/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/project-manager/www/one.tcl 3 Jun 2005 22:13:44 -0000 1.6 +++ openacs-4/packages/project-manager/www/one.tcl 21 Jun 2005 22:16:39 -0000 1.7 @@ -116,7 +116,7 @@ set my_title "$project_term \#$project_item_id: $project(project_name)" set forum_id [application_data_link::get_linked -from_object_id $project(item_id) -to_object_type "forums_forum"] -set folder_id [application_data_link::get_linked -from_object_id $project(item_id) -to_object_type "content_folder"] +set folder_id [lindex [application_data_link::get_linked -from_object_id $project(item_id) -to_object_type "content_folder"] 0] # set up context bar, needs project(parent_id) Index: openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp 17 Jun 2005 09:26:59 -0000 1.2 +++ openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.adp 21 Jun 2005 22:16:39 -0000 1.3 @@ -1,3 +1,3 @@ + base_url="@base_url@" filters_p="0" display_mode="list"> Index: openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl 17 Jun 2005 09:26:59 -0000 1.2 +++ openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl 21 Jun 2005 22:16:39 -0000 1.3 @@ -1,14 +1,16 @@ array set config $cf -set community_id [dotlrn_community::get_community_id_from_url \ - -url [ad_conn url] \ - ] +set community_id [dotlrn_community::get_community_id_from_url] if {![empty_string_p $community_id]} { set base_url "project-manager/" + set pm_package_id [dotlrn_community::get_package_id_from_package_key -package_key "project-manager" -community_id $community_id] +} else { + + set base_url "" + set pm_package_id "" } -set package_id $config(project_manager_id)