Index: openacs-4/packages/project-manager/lib/tasks-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-portlet.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/project-manager/lib/tasks-portlet.adp	10 May 2006 19:40:52 -0000	1.14
+++ openacs-4/packages/project-manager/lib/tasks-portlet.adp	10 Aug 2006 09:18:09 -0000	1.15
@@ -19,8 +19,8 @@
     <include src=/packages/project-manager/lib/tasks project_id="@project_id@"
     pid_filter="@project_item_id@" return_url="@return_url@"
     elements="@elements@" display_mode="list" fmt=@fmt@
-    instance_id="@instance_id@" status_id="1" page="@page@"
-    page_size="@page_size@" orderby_tasks="@orderby_tasks@">
+    instance_id="@instance_id@" status_id="1" page="@page@" orderby_p="@orderby_p@"
+    page_size="@page_size@" tasks_orderby="@tasks_orderby@">
   </td>
 </tr>
 <tr class="list-button-bar">
Index: openacs-4/packages/project-manager/lib/tasks-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-portlet.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/project-manager/lib/tasks-portlet.tcl	10 May 2006 19:40:52 -0000	1.9
+++ openacs-4/packages/project-manager/lib/tasks-portlet.tcl	10 Aug 2006 09:18:09 -0000	1.10
@@ -12,7 +12,7 @@
 	return -code error "$required_param is a required parameter."
     }
 }
-foreach optional_param { page page_size orderby_tasks } {
+foreach optional_param { page page_size tasks_orderby } {
     if {![info exists $optional_param]} {
 	set $optional_param {}
     }
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.25 -r1.26
--- openacs-4/packages/project-manager/lib/tasks-postgresql.xql	26 Jun 2006 09:31:12 -0000	1.25
+++ openacs-4/packages/project-manager/lib/tasks-postgresql.xql	10 Aug 2006 09:18:09 -0000	1.26
@@ -29,7 +29,6 @@
         s.status_type,
         s.description as status_description,
  	t.priority,
- 	t.next_assignee_id,
 	t.parent_id,
 	op.title as project_name
 	FROM
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.57 -r1.58
--- openacs-4/packages/project-manager/lib/tasks.tcl	26 Jun 2006 09:31:12 -0000	1.57
+++ openacs-4/packages/project-manager/lib/tasks.tcl	10 Aug 2006 09:18:09 -0000	1.58
@@ -32,7 +32,7 @@
 #                then filters would be added as well.
 
 set required_param_list [list]
-set optional_param_list [list orderby searchterm page actions_p base_url page_num page_size bulk_actions_p]
+set optional_param_list [list tasks_orderby searchterm page actions_p base_url page_num page_size bulk_actions_p]
 set optional_unset_list [list \
 			     filter_party_id filter_group_id pid_filter \
 			     is_observer_filter instance_id filter_package_id \
@@ -103,7 +103,7 @@
     set days_string "hours"
 }
 
-set exporting_vars {status_id party_id orderby page_num}
+set exporting_vars {status_id party_id tasks_orderby page_num}
 set hidden_vars [export_vars \
 		     -no_empty -form $exporting_vars]
 
@@ -367,7 +367,6 @@
 	    label "[_ project-manager.Subject_1]"
 	    display_template {
 		<font color="@tasks.title_color@">@tasks.title@</font>
-		<if @tasks.next_assignee_id@ not nil>#wieners.task_list_next_assignee#</if>
 	    }
 	}
         parent_task_id {
@@ -478,7 +477,7 @@
     -page_size $page_size \
     -page_flush_p 1 \
     -page_query_name tasks_pagination \
-    -orderby_name orderby \
+    -orderby_name tasks_orderby \
     -html {
 	width 100%
     } \
Index: openacs-4/packages/project-manager/templates/project-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/project-manager/templates/project-ae.tcl	4 May 2006 13:29:09 -0000	1.7
+++ openacs-4/packages/project-manager/templates/project-ae.tcl	10 Aug 2006 09:18:09 -0000	1.8
@@ -233,6 +233,10 @@
 	set planned_start_date_sql "to_timestamp('$planned_start_date','YYYY MM DD HH24 MI SS')"
 	set planned_end_date_sql "to_timestamp('$planned_end_date_list','YYYY MM DD HH24 MI SS')"
 
+        # insert the comment into the database
+        set description_body [template::util::richtext::get_property contents $description]
+        set description_format [template::util::richtext::get_property format $description]
+
     } -new_data {
 
 	db_transaction {
@@ -253,7 +257,7 @@
 				-object_id $project_id \
 				-form add_edit \
 				-cr_widget none \
-				-defaults [list title $project_name description $description mime_type "text/plain" context_id $parent_id parent_id $parent_id object_type pm_project] \
+				-defaults [list title $project_name description $description_body mime_type $description_format context_id $parent_id parent_id $parent_id object_type pm_project] \
 				-default_fields {project_code goal {planned_start_date $planned_start_date_sql} {planned_end_date $planned_end_date_sql} actual_start_date actual_end_date ongoing_p status_id customer_id dform} \
 				-exclude_static]
 
@@ -295,7 +299,7 @@
 				-object_id $project_id \
 				-form add_edit \
 				-cr_widget none \
-				-defaults [list title $project_name description $description mime_type "text/plain" context_id $parent_id parent_id $parent_id object_type pm_project] \
+				-defaults [list title $project_name description $description_body mime_type $description_format context_id $parent_id parent_id $parent_id object_type pm_project] \
 				-default_fields {project_code goal {planned_start_date $planned_start_date_sql} {planned_end_date $planned_end_date_sql} actual_start_date actual_end_date ongoing_p status_id customer_id dform} \
 				-exclude_static]
 
Index: openacs-4/packages/project-manager/templates/project-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/project-manager/templates/project-one.adp	10 May 2006 19:40:52 -0000	1.17
+++ openacs-4/packages/project-manager/templates/project-one.adp	10 Aug 2006 09:18:09 -0000	1.18
@@ -49,7 +49,7 @@
       instance_id="@instance_id@" 
       fmt="@fmt@" 
       orderby_p="1"
-      orderby_tasks="@orderby_tasks@"
+      tasks_orderby="@tasks_orderby@"
       page="@page@"
 	/>
     <p />
Index: openacs-4/packages/project-manager/templates/project-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/templates/project-one.tcl	10 May 2006 18:51:42 -0000	1.5
+++ openacs-4/packages/project-manager/templates/project-one.tcl	10 Aug 2006 09:18:09 -0000	1.6
@@ -54,4 +54,4 @@
 } else {
     set parent_name [pm::util::get_project_name -project_item_id $project(parent_id)]
     set context [list [list "one?project_item_id=$project(parent_id)" "$parent_name"] "$project(project_name)"]
-}
+}
\ No newline at end of file
Index: openacs-4/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/project-manager/www/one.adp	18 Nov 2005 16:27:19 -0000	1.10
+++ openacs-4/packages/project-manager/www/one.adp	10 Aug 2006 09:18:09 -0000	1.11
@@ -1 +1 @@
-<include src=@template_src@ project_id=@project_id@ project_item_id=@project_item_id@ instance_id=@instance_id@ logger_days=@logger_days@ logger_variable_id=@logger_variable_id@ orderby_tasks=@orderby_tasks@ orderby_subproject=@orderby_subproject@ page=@page@>
+<include src=@template_src@ project_id=@project_id@ project_item_id=@project_item_id@ instance_id=@instance_id@ logger_days=@logger_days@ logger_variable_id=@logger_variable_id@ tasks_orderby=@tasks_orderby@ orderby_subproject=@orderby_subproject@ page=@page@>
Index: openacs-4/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/project-manager/www/one.tcl	10 May 2006 19:40:53 -0000	1.12
+++ openacs-4/packages/project-manager/www/one.tcl	10 Aug 2006 09:18:09 -0000	1.13
@@ -31,7 +31,7 @@
     pid_filter:integer,optional
     {page:integer ""}
     {orderby_subproject ""}
-    {orderby_tasks ""}
+    {tasks_orderby ""}
     {logger_variable_id:integer ""}
     {logger_days:integer "30"}
     {instance_id:integer ""}