Index: openacs-4/packages/project-manager/tcl/calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/calendar-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/project-manager/tcl/calendar-procs.tcl 22 Jul 2005 21:29:28 -0000 1.6 +++ openacs-4/packages/project-manager/tcl/calendar-procs.tcl 30 Jul 2005 00:26:33 -0000 1.7 @@ -50,6 +50,7 @@ {-hide_closed_p "t"} {-display_p "l"} {-display_item "t"} + {-package_id ""} } { Creates a month widget for tasks if display_item=t Creates a month widget for projects if display_item=p @@ -60,13 +61,14 @@ set next_nav_template ">" set instance_clause "" - set package_id [dotlrn_community::get_package_id_from_package_key -package_key project-manager -community_id [dotlrn_community::get_community_id]] + if { [empty_string_p $package_id]} { + set package_id [dotlrn_community::get_package_id_from_package_key -package_key project-manager -community_id [dotlrn_community::get_community_id]] + } - - if { ![string eq [ad_conn package_id] [dotlrn::get_package_id]]} { set instance_clause "and o.package_id=:package_id" } + if {[empty_string_p $date]} { set date [dt_systime] @@ -229,8 +231,8 @@ set hide_closed_clause "" } - set selected_users [pm::calendar::users_to_view] - set selected_users_clause " and ts.project_id in (select project_id from pm_project_assignment where party_id in ([join $selected_users ", "]))" + set selected_users [pm::calendar::users_to_view] + set selected_users_clause " and i.item_id in (select project_id from pm_project_assignment where party_id in ([join $selected_users ", "]))" set last_project_id "" set deadline "" @@ -276,7 +278,7 @@ set day_details "

${detail_begin}$project_id
$project_name${detail_end}" # only add to the list if we want to see closed projects - #append day_details "