Index: openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql 15 Sep 2005 22:43:53 -0000 1.5
+++ openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql 25 Oct 2005 06:34:01 -0000 1.6
@@ -29,7 +29,8 @@
t.actual_hours_worked,
s.status_type,
s.description as status_description,
- r.is_lead_p,
+ t.is_lead_p,
+ t.is_observer_p,
t.priority,
t.party_id,
p.title as project_name
@@ -50,12 +51,11 @@
tr.actual_hours_worked,
tr.parent_id,
tr.revision_id,
- tr.priority
+ pr.is_observer_p,
+ tr.priority,
+ pr.is_lead_p
from pm_tasks_revisionsx tr, pm_task_assignment ta, pm_roles pr
- where ta.task_id = tr.item_id and ta.role_id = pr.role_id $extra_query) t
- LEFT JOIN
- pm_roles r
- ON t.role_id = r.role_id,
+ where ta.task_id = tr.item_id and ta.role_id = pr.role_id $extra_query $done_clause) t,
cr_items i,
pm_tasks_active ti,
pm_task_status s,
@@ -70,7 +70,6 @@
where ppm.object_id = ti.task_id
and ppm.privilege = 'read'
and ppm.party_id = :user_id)
- $done_clause
[template::list::filter_where_clauses -and -name tasks]
order by end_date desc
Index: openacs-4/packages/project-manager-portlet/lib/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/tasks.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager-portlet/lib/tasks.adp 25 Aug 2005 19:46:03 -0000 1.3
+++ openacs-4/packages/project-manager-portlet/lib/tasks.adp 25 Oct 2005 06:34:01 -0000 1.4
@@ -46,7 +46,4 @@
#project-manager-portlet.my_tasks# |
#project-manager-portlet.pool_tasks#
-
- (#project-manager-portlet.clear#)
-
Index: openacs-4/packages/project-manager-portlet/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/tasks.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager-portlet/lib/tasks.tcl 15 Sep 2005 22:43:53 -0000 1.5
+++ openacs-4/packages/project-manager-portlet/lib/tasks.tcl 25 Oct 2005 06:34:01 -0000 1.6
@@ -42,7 +42,7 @@
set package_id [ad_conn package_id]
}
-if { ![empty_string_p $is_observer_p] } {
+if { $is_observer_p == "f" } {
set extra_query "and pr.is_observer_p = :is_observer_p"
} else {
set extra_query ""
@@ -57,7 +57,7 @@
-parameter "HideDoneTaskP" -default "1"]
if {$hide_done_tasks_p} {
- set done_clause "and t.percent_complete < 100"
+ set done_clause "and tr.percent_complete < 100"
} else {
set done_clause ""
}
@@ -168,13 +168,14 @@
}
+##### maltes: Why on earth do we need this query?
# 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 1 = ( select 1 from dual where t.party_id = :user_id or :user_id in (
- select object_id_two from acs_rels where object_id_one = t.party_id and rel_type = 'membership_rel'))"
- } else {
+# if {[exists_and_not_null party_id]} {
+# set party_where_clause "and 1 = ( select 1 from dual where t.party_id = :user_id or :user_id in (
+# select object_id_two from acs_rels where object_id_one = t.party_id and rel_type = 'membership_rel'))"
+# } else {
set party_where_clause ""
- }
+# }
# If we display the items of a single user, show the role. Otherwise
@@ -238,6 +239,7 @@
}
title {
label "[_ project-manager.Subject_1]"
+ display_template {@tasks.title@@tasks.title@}
}
parent_task_id {
label "[_ project-manager.Dep]"
Index: openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl 17 Oct 2005 21:45:49 -0000 1.9
+++ openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl 25 Oct 2005 06:34:02 -0000 1.10
@@ -2,7 +2,7 @@
} {
{watcher_p 0}
{page_num 0}
- {is_observer_p ""}
+ {is_observer_p "f"}
}
# daily?
set daily_p [parameter::get -parameter "UseDayInsteadOfHour" -default "f"]