Index: openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	1 Jul 2004 21:40:30 -0000	1.17
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	1 Jul 2004 22:56:18 -0000	1.18
@@ -1793,7 +1793,7 @@
     
     @error 
 } {
-    return [util_memoize [list pm::project::assignee_filter_select_helper -status_id $status_id] 3]
+    return [util_memoize [list pm::project::assignee_filter_select_helper -status_id $status_id] 600]
 }
 
 
@@ -1814,17 +1814,19 @@
     @error 
 } {
     return [db_list_of_lists get_people {
-        SELECT
+SELECT
         distinct(first_names || ' ' || last_name) as fullname, 
         u.person_id 
         FROM
         persons u, 
         pm_project_assignment a,
-        pm_projects p
+        pm_projects p, 
+        cr_items i
         WHERE 
         u.person_id = a.party_id and
-        p.project_id = a.project_id and
-        p.status_id = :status_id
+        i.item_id = a.project_id and
+        p.status_id = :status_id and 
+        i.live_revision = p.project_id
         ORDER BY
         fullname
     }]
Index: openacs-4/contrib/packages/project-manager/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index-postgresql.xql,v
diff -u -r1.12 -r1.13
--- openacs-4/contrib/packages/project-manager/www/index-postgresql.xql	12 Mar 2004 13:44:44 -0000	1.12
+++ openacs-4/contrib/packages/project-manager/www/index-postgresql.xql	1 Jul 2004 22:56:19 -0000	1.13
@@ -27,6 +27,8 @@
                 end as customer_name,
         o.organization_id as customer_id
         FROM pm_projectsx p 
+             LEFT JOIN pm_project_assignment pa 
+                ON p.item_id = pa.project_id
              LEFT JOIN organizations o ON p.customer_id =
                 o.organization_id 
              LEFT JOIN (
Index: openacs-4/contrib/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/project-manager/www/index.tcl	11 Jun 2004 20:58:19 -0000	1.15
+++ openacs-4/contrib/packages/project-manager/www/index.tcl	1 Jul 2004 22:56:19 -0000	1.16
@@ -20,6 +20,7 @@
     {status_id:integer,optional}
     category_id:multiple,optional
     {format "normal"}
+    {assignee_id:integer,optional}
 } -properties {
 
     context:onevalue
@@ -76,7 +77,7 @@
                          -package_id $package_id \
                         ] 
 
-# set assignees_filter [pm::project::assignee_filter_select -status_id $status_id]
+set assignees_filter [pm::project::assignee_filter_select -status_id $status_id]
 
 template::list::create \
     -name projects \
@@ -121,6 +122,11 @@
             values {[pm::status::project_status_select]}
             where_clause {s.status_id = :status_id}
         }
+        assignee_id {
+            label "Assignee"
+            values {$assignees_filter}
+            where_clause {pa.party_id = :assignee_id}
+        }
         category_id {
             label Categories
             where_clause {c.category_id = [join [value_if_exists category_id] ","]}
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.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl	11 Jun 2004 20:58:20 -0000	1.5
+++ openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl	1 Jul 2004 22:56:19 -0000	1.6
@@ -4,8 +4,15 @@
 set package_id [ad_conn package_id]
 set package_url [ad_conn package_url]
 set page_url [ad_conn url]
+set page_query [ad_conn query]
+
+if {[string is false [empty_string_p $page_query]]} {
+    set page_query "?$page_query"
+}
+
 set logger_url [pm::util::logger_url]
 
+
 set admin_p [permission::permission_p -object_id $package_id -privilege admin]
 
 # The links used in the navbar on format url1 label1 url2 label2 ...
@@ -17,7 +24,7 @@
     lappend link_list {}
     lappend link_list "Tasks"
 
-    lappend link_list [list "${package_url}"]
+    lappend link_list [list "${package_url}?assignee_id=${user_id}"]
     lappend link_list {}
     lappend link_list "Projects"
 
@@ -48,7 +55,7 @@
 
     foreach url $url_list {
 
-        if {[string equal $page_url $url]} {
+        if {[string equal "$page_url$page_query" $url]} {
             set selected_p 1
         }
     }