Index: openacs-4/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/project-manager.info,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/project-manager/project-manager.info 29 Jul 2005 23:22:36 -0000 1.12
+++ openacs-4/packages/project-manager/project-manager.info 10 Aug 2005 22:22:25 -0000 1.13
@@ -7,14 +7,14 @@
f
f
-
+
Jade Rubick
Project management tool for OpenACS
2005-01-13
Integrated Bakery Resources
Track tasks, estimates and actual progress for a project. See the <a href="http://openacs.org/projects/dotwrk/project_management/">project page</a> for more information.
-
+
@@ -44,7 +44,11 @@
+
+
+
+
+
-
Index: openacs-4/packages/project-manager/lib/projects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/project-manager/lib/projects.tcl 10 Aug 2005 19:32:36 -0000 1.12
+++ openacs-4/packages/project-manager/lib/projects.tcl 10 Aug 2005 22:22:26 -0000 1.13
@@ -6,7 +6,7 @@
# @cvs-id $Id$
set required_param_list [list package_id]
-set optional_param_list [list orderby status_id searchterm bulk_p action_p filter_p base_url customer_id end_date_f]
+set optional_param_list [list orderby status_id searchterm bulk_p action_p filter_p base_url end_date_f]
set optional_unset_list [list assignee_id date_range]
foreach required_param $required_param_list {
Index: openacs-4/packages/project-manager/lib/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/tasks-postgresql.xql 30 Jul 2005 00:26:33 -0000 1.4
+++ openacs-4/packages/project-manager/lib/tasks-postgresql.xql 10 Aug 2005 22:22:26 -0000 1.5
@@ -82,6 +82,7 @@
t.revision_id = i.live_revision and
t.item_id = ti.task_id and
ti.status = s.status_id
+ $party_where_clause
and ar.object_id_one = t.parent_id
and ar.rel_type = 'application_data_link'
and o.object_id = ar.object_id_two
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.10 -r1.11
--- openacs-4/packages/project-manager/lib/tasks.tcl 10 Aug 2005 21:15:36 -0000 1.10
+++ openacs-4/packages/project-manager/lib/tasks.tcl 10 Aug 2005 22:22:26 -0000 1.11
@@ -113,7 +113,7 @@
if {[info exists party_id]} {
unset party_id
- }
+ }
if {[regexp {([0-9]+)} $searchterm match query_digits]} {
set search_term_where " (upper(t.title) like upper('%$searchterm%')
@@ -169,6 +169,20 @@
set element "actual_${days_string}_worked"
}
+
+ # We need to filter by the user if a party_id is given
+ if {[exists_and_not_null party_id]} {
+ set party_where_clause "and t.party_id = :party_id"
+
+ # Do we want to show observer tasks as well?
+ if {[parameter::get -parameter "ShowObserverTasksP"] == 0} {
+ append party_where_clause "\n and r.is_observer_p = 'f' "
+ }
+ } else {
+ set party_where_clause ""
+ }
+
+
# If we display the items of a single user, show the role. Otherwise
# show all players.
@@ -188,7 +202,7 @@
label "[_ project-manager.People]" \
values "[pm::task::assignee_filter_select \
-status_id $status_id]" \
- where_clause "ta.party_id = :party_id"
+ where_clause ""
]
]
}