Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -r1.31.2.14 -r1.31.2.15
--- openacs-4/contrib/packages/project-manager/www/one.adp 20 Dec 2004 19:48:30 -0000 1.31.2.14
+++ openacs-4/contrib/packages/project-manager/www/one.adp 25 Apr 2005 11:09:21 -0000 1.31.2.15
@@ -7,6 +7,7 @@
@my_title;noquote@
@context;noquote@
+ @project_item_id@
(not current, select live version from the task change page)
Index: openacs-4/contrib/packages/project-manager/www/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/lib/Attic/master.adp,v
diff -u -r1.2.2.4 -r1.2.2.5
--- openacs-4/contrib/packages/project-manager/www/lib/master.adp 9 Dec 2004 18:27:56 -0000 1.2.2.4
+++ openacs-4/contrib/packages/project-manager/www/lib/master.adp 25 Apr 2005 11:09:21 -0000 1.2.2.5
@@ -18,11 +18,12 @@
@import url(@package_url@style.css) all;
-
+
-
+
+
Index: openacs-4/contrib/packages/project-manager/www/lib/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/lib/Attic/master.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/contrib/packages/project-manager/www/lib/master.tcl 12 Mar 2004 13:44:47 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/lib/master.tcl 25 Apr 2005 11:09:21 -0000 1.2.2.1
@@ -3,3 +3,5 @@
set package_url [ad_conn package_url]
if { ![info exists header_stuff] } { set header_stuff {} }
+
+if { ![info exists project_item_id] } { set project_item_id "" }
\ No newline at end of file
Index: openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/lib/Attic/nav-bar.tcl,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl 13 Aug 2004 18:57:34 -0000 1.2.2.3
+++ openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl 25 Apr 2005 11:09:21 -0000 1.2.2.4
@@ -20,7 +20,12 @@
if { [ad_conn user_id] != 0} {
- lappend link_list [list "${package_url}tasks"]
+ if [empty_string_p $project_item_id] {
+ lappend link_list [list "${package_url}tasks"]
+ } else {
+ lappend link_list [list [export_vars -base "${package_url}tasks" {{project_item_id}}]]
+ }
+
lappend link_list {}
lappend link_list "Tasks"
@@ -36,7 +41,12 @@
lappend link_list {}
lappend link_list "Processes"
- lappend link_list [list "${logger_url}?user_id=${user_id}"]
+ if [empty_string_p $project_item_id] {
+ lappend link_list [list "[export_vars -base ${logger_url} {user_id {project_manager_url $package_url}}]"]
+ } else {
+ set logger_project_id [pm::project::get_logger_project -project_item_id $project_item_id]
+ lappend link_list [list "[export_vars -base ${logger_url} {{project_manager_url $package_url} {project_id $logger_project_id}}]"]
+ }
lappend link_list {}
lappend link_list "Logger"