Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v diff -u -r1.4.2.47 -r1.4.2.48 --- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 21 Jul 2005 23:08:36 -0000 1.4.2.47 +++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 4 Oct 2005 08:35:04 -0000 1.4.2.48 @@ -800,11 +800,17 @@ object_id } { + # Normal projects set package_id [db_string pm_package_id "select package_id from cr_folders cf, cr_items ci1, cr_items ci2 where cf.folder_id = ci1.parent_id and ci1.item_id = ci2.parent_id and ci2.item_id = :object_id" -default 0] + # Subprojects if {$package_id == 0} { - - set url [site_node_closest_ancestor_package_url -package_key "project-manager"] + set package_id [db_string pm_package_id "select package_id from cr_folders cf, cr_items ci1, cr_items ci2, cr_items ci3 where cf.folder_id = ci1.parent_id and ci1.item_id = ci2.parent_id and ci2.item_id = ci3.parent_id and ci3.item_id = :object_id" -default 0] + } + + if {$package_id == 0} { + set url "[ad_url]" + append url [site_node_closest_ancestor_package_url -package_key "project-manager"] } else { set url "[ad_url]" append url [site_node::get_url_from_object_id -object_id $package_id]