Index: openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-select-project-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql	27 Apr 2004 00:49:29 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql	6 May 2004 17:58:17 -0000	1.4
@@ -6,13 +6,23 @@
         SELECT
         p.item_id as project_item_id,
         p.title as project_name,
-        p.description as description
-        FROM pm_projectsx p, cr_items i, pm_project_status s
+        p.description as description,
+        p.mime_type,
+        o.organization_id as customer_id,
+        o.name as customer_name
+        FROM 
+        pm_projectsx p
+          LEFT JOIN
+          organizations o
+          ON
+          p.customer_id = o.organization_id, 
+        cr_items i, 
+        pm_project_status s
         WHERE p.project_id = i.live_revision and
         p.parent_id = :root_folder and
-        p.status_id = s.status_id and
-        s.status_type = 'o'
-        ORDER BY upper(p.title)
+        p.status_id = s.status_id 
+        [template::list::filter_where_clauses -and -name projects]
+        [template::list::orderby_clause -orderby -name projects]
     </querytext>
   </fullquery>
 
Index: openacs-4/contrib/packages/project-manager/www/task-select-project.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-select-project.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/task-select-project.adp	27 Apr 2004 00:49:29 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/task-select-project.adp	6 May 2004 17:58:17 -0000	1.4
@@ -1,5 +1,29 @@
 <master>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context@</property>
 <property name="title">@title@</property>
 
-@choices;noquote@
+  <table cellpadding="3" cellspacing="3">
+    
+    <tr>
+      
+      <td class="list-filter-pane" valign="top" width="200">
+        
+        <form method=post name=search action=task-select-project>
+          Project Search:<br />
+          <input type=text name=searchterm value="@searchterm_copy@" size="15" />
+          @hidden_vars;noquote@
+        </form>
+
+        <listfilters name="projects"></listfilters>
+
+    </td>
+
+    <td class="list-list-pane" valign="top">
+
+        <listtemplate name="projects"></listtemplate>
+
+    </td>
+
+  </tr>
+
+</table>
Index: openacs-4/contrib/packages/project-manager/www/task-select-project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-select-project.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/task-select-project.tcl	27 Apr 2004 00:49:29 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/task-select-project.tcl	6 May 2004 17:58:17 -0000	1.4
@@ -14,13 +14,17 @@
 } {
 
     {process_id:integer ""}
-    {return_url ""}
+    {return_url "index"}
+    {status_type "o"}
+    {searchterm ""}
+    {orderby ""}
     
 } -properties {
 
     context_bar:onevalue
     title:onevalue
     choices:onevalue
+    searchterm_copy:onevalue
 
 } -validate {
 } -errors {
@@ -31,6 +35,13 @@
 set user_id    [ad_maybe_redirect_for_registration]
 set package_id [ad_conn package_id]
 
+permission::require_permission -object_id $package_id -privilege write
+
+if {[empty_string_p $searchterm]} {
+    unset searchterm
+}
+
+
 # terminology
 set project_term    [parameter::get -parameter "ProjectName" -default "Project"]
 set task_term       [parameter::get -parameter "TaskName" -default "Task"]
@@ -40,10 +51,18 @@
 
 set title "Select a $project_term to assign this $task_term to"
 
+if {![exists_and_not_null searchterm]} {
+    set searchterm_copy ""
+    set searchterm_where_clause ""
+} else {
+    set searchterm_copy $searchterm
+    set searchterm_where_clause "upper(p.title) like upper('%$searchterm%')"
+}
+
 if {[exists_and_not_null process_id]} {
-    set context_bar [ad_context_bar [list "processes" "Processes"] "Use"]
+    set context [list [list "processes" "Processes"] "Use"]
 } else {
-    set context_bar [ad_context_bar [list "tasks" "Tasks"] "Select Project"]
+    set context [list [list "tasks" "Tasks"] "Select Project"]
 }
 
 # need to change this to show all the projects you're on by
@@ -52,12 +71,77 @@
 
 set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, 'f')"]
 
-set export_vars [export_vars -url {process_id return_url}]
+set hidden_vars [export_vars -form {process_id return_url}]
 
-db_foreach select_a_project { } -column_array proj {
-    append choices "<a href=\"task-add-edit?$export_vars&project_item_id=$proj(project_item_id)\">$proj(project_name)</a> <font color=\"777777\" size=\"-1\">$proj(description)</font><br />"
-} if_no_rows {
-    append choices "No open projects to add tasks to"
-}
+template::list::create \
+    -name projects \
+    -multirow projects \
+    -key project_item_id \
+    -elements {
+        customer_name {
+            label "Customer"
+        }
+        project_item_id {
+            label "Project"
+            link_url_col item_url
+            display_template "@projects.project_name@"
+        }
+        description {
+            label "Description"
+            display_template "@projects.description_html;noquote@"
+        }
+    } \
+    -sub_class {
+        narrow
+    } \
+    -filters {
+        customer_name {
+            label "Customer"
+            where_clause {p.organization_id = :customer_id}
+        }
 
+        searchterm {
+            label "Project Search term"
+            where_clause $searchterm_where_clause
+        }
+ 
+       status_type {
+            label "Status"
+            values {{"Open" o} {"Closed" c}}
+            where_clause {
+                s.status_type = :status_type
+            }
+        }
+        return_url {
+            hide_p 1
+        }
+    } \
+    -orderby {
+        default_value customer_name,asc
+        project_item_id {
+            label "Project"
+            orderby_desc "upper(p.title) desc"
+            orderby_asc "upper(p.title) asc"
+            default_direction asc
+        }
+        customer_name {
+            label "Customer"
+            orderby_desc "upper(o.name) desc, upper(p.title) desc"
+            orderby_asc "upper(o.name) asc, upper(p.title) asc"
+            default_direction asc
+        }
+    } \
+    -orderby_name orderby \
+    -html {
+        width 100%
+    }
 
+
+db_multirow -extend { item_url description_html } projects select_a_project {
+} {
+    set item_url [export_vars -base "task-add-edit" {project_item_id process_id return_url}]
+
+    set richtext_list [list $description $mime_type]
+    set description_html [template::util::richtext::get_property html_value $richtext_list]
+}
+