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.7 -r1.8
--- openacs-4/packages/project-manager/tcl/calendar-procs.tcl 30 Jul 2005 00:26:33 -0000 1.7
+++ openacs-4/packages/project-manager/tcl/calendar-procs.tcl 15 Sep 2005 19:36:40 -0000 1.8
@@ -55,21 +55,25 @@
Creates a month widget for tasks if display_item=t
Creates a month widget for projects if display_item=p
} {
-
+ set dotlrn_installed_p [apm_package_installed_p dotlrn]
set day_template "\$day_number"
set prev_nav_template "<"
set next_nav_template ">"
set instance_clause ""
- 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 {$dotlrn_installed_p} {
+ 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]]
+ } else {
+ set package_id [ad_conn package_id]
+ }
+ if { ![string eq [ad_conn package_id] [dotlrn::get_package_id]]} {
+ set instance_clause "and o.package_id=:package_id"
+ }
+ } else {
+ set package_id [ad_conn package_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]
}
@@ -313,4 +317,4 @@
}
-}
\ No newline at end of file
+}