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.11 -r1.12
--- openacs-4/packages/project-manager/lib/tasks-postgresql.xql	25 Oct 2005 23:06:00 -0000	1.11
+++ openacs-4/packages/project-manager/lib/tasks-postgresql.xql	27 Oct 2005 21:48:03 -0000	1.12
@@ -36,6 +36,7 @@
 	t.priority,
         p.customer_id,
         p.title as project_name,
+	t.description,
 	ar.object_id_two as logger_project
 	FROM
 	(select tr.item_id,
@@ -54,6 +55,7 @@
                 tr.actual_hours_worked,
                 tr.parent_id,
                 tr.revision_id,
+		tr.description,
 		tr.priority
          from pm_tasks_revisionsx tr
          LEFT JOIN
@@ -105,6 +107,7 @@
                 tr.latest_start,
                 tr.latest_finish,
                 tr.percent_complete,
+		tr.description,
                 tr.estimated_hours_work,
                 tr.estimated_hours_work_min,
                 tr.estimated_hours_work_max,
@@ -152,4 +155,15 @@
     </querytext>
 </fullquery>
 
+<fullquery name="get_assignee_name">
+    <querytext>
+	select 
+		username 
+	from 
+		users 
+	where 
+		user_id = :party_id
+    </querytext>
+</fullquery>
+
 </queryset>
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.27 -r1.28
--- openacs-4/packages/project-manager/lib/tasks.tcl	25 Oct 2005 23:06:00 -0000	1.27
+++ openacs-4/packages/project-manager/lib/tasks.tcl	27 Oct 2005 21:48:03 -0000	1.28
@@ -1,6 +1,7 @@
 # Possible
 # party_id
 # role_id
+# orderby_p   Set it to 1 if you want to show the order by menu.
 
 set required_param_list [list]
 set optional_param_list [list orderby searchterm status_id page bulk_p actions_p base_url page_num page_size]
@@ -32,7 +33,11 @@
     set page_size 25
 }
 
+if ![info exists orderby_p] {
+    set orderby_p 0
+}
 
+
 if ![info exists display_mode] {
     set display_mode "all"
 }
@@ -234,6 +239,44 @@
 }
 
 
+if { $orderby_p } {
+    set order_by_list [list \
+			   default_value $default_orderby \
+			   title {
+			       label "[_ project-manager.Subject_1]"
+			       orderby_desc "t.title desc, task_item_id"
+			       orderby_asc "t.title asc, task_item_id"
+			       default_direction asc
+			   } \
+			   description {
+			       label "[_ project-manager.Description]"
+			       orderby_desc "t.description desc, task_item_id"
+			       orderby_asc "t.description, task_item_id"
+			       default_direction asc
+			   } \
+			   slack_time {
+			       label "[_ project-manager.Slack_1]"
+			       orderby_desc "(latest_start - earliest_start) desc, task_item_id"
+			       orderby_asc "(latest_start - earliest_start), task_item_id"
+			       default_direction asc
+			   } \
+			   status {
+			       label "[_ project-manager.Status_1]"
+			       orderby_desc "status desc, t.latest_finish desc, task_item_id"
+			       orderby_asc "status asc, t.latest_finish desc, task_item_id"
+			       default_direction asc
+			   } \
+			   end_date {
+			       orderby_asc "end_date, task_item_id asc"
+			       orderby_desc "end_date desc, task_item_id desc"
+			       default_direction asc
+			   } \
+			  ]
+} else {
+    set order_by_list [list]
+}
+
+
 template::list::create \
     -name tasks \
     -multirow tasks \
@@ -366,38 +409,7 @@
 	narrow
     } \
     -filters $filters \
-    -orderby {
-	default_value $default_orderby
-	title {
-	    label "[_ project-manager.Subject_1]"
-	    orderby_desc "t.title desc, task_item_id"
-	    orderby_asc "t.title asc, task_item_id"
-	    default_direction asc
-	}
-	description {
-	    label "[_ project-manager.Description]"
-	    orderby_desc "t.description desc, task_item_id"
-	    orderby_asc "t.description, task_item_id"
-	    default_direction asc
-	}
-	slack_time {
-	    label "[_ project-manager.Slack_1]"
-	    orderby_desc "(latest_start - earliest_start) desc, task_item_id"
-	    orderby_asc "(latest_start - earliest_start), task_item_id"
-	    default_direction asc
-	}
-	status {
-	    label "[_ project-manager.Status_1]"
-	    orderby_desc "status desc, t.latest_finish desc, task_item_id"
-	    orderby_asc "status asc, t.latest_finish desc, task_item_id"
-	    default_direction asc
-	}
-	end_date {
-	    orderby_asc "end_date, task_item_id asc"
-	    orderby_desc "end_date desc, task_item_id desc"
-	    default_direction asc
-	}
-    } \
+    -orderby $order_by_list \
     -actions $actions \
     -checkbox_name multiselect \
     -bulk_actions $bulk_actions \
@@ -428,20 +440,36 @@
     set assign_group_p [parameter::get -parameter "AssignGroupP" -default 0]
 }
 
+set user_instead_full_p [parameter::get -parameter "UsernameInsteadofFullnameP" -default "f"]
+
 db_multirow -extend {item_url earliest_start_pretty earliest_finish_pretty end_date_pretty latest_start_pretty latest_finish_pretty slack_time edit_url log_url hours_remaining days_remaining actual_days_worked my_user_id user_url base_url task_close_url project_url assignee_name} tasks tasks " " {
     
     if { $assign_group_p } {
 	# We are going to show all asignees including groups
-	if { [catch {set assignee_name [person::name -person_id $party_id] } err] } {
-	    # person::name give us an error so its probably a group so we get
-	    # the title
-	    set assignee_name [group::title -group_id $party_id]
+	if { $user_instead_full_p } {
+	    set assignee_name [db_string get_assignee_name { } -default ""]
+	    if { [empty_string_p $assignee_name] } {
+		set assignee_name [group::title -group_id $party_id]		
+	    }
+	} else {
+	    if { [catch {set assignee_name [person::name -person_id $party_id] } err] } {
+		# person::name give us an error so its probably a group so we get
+		# the title
+		set assignee_name [group::title -group_id $party_id]
+	    }
 	}
     } else {
-	if { [catch {set assignee_name [person::name -person_id $party_id] } err] } {
-	    # person::name give us an error so its probably a group, here we don't want
-	    # to show any group so we just continue the multirow
-	    continue
+	if { $user_instead_full_p } {
+	    set assignee_name [db_string get_assignee_name {  } -default ""]
+	    if { [empty_string_p $assignee_name] } {
+		continue
+	    }
+	} else {
+	    if { [catch {set assignee_name [person::name -person_id $party_id] } err] } {
+		# person::name give us an error so its probably a group, here we don't want
+		# to show any group so we just continue the multirow
+		continue
+	    }
 	}
     }
 
Index: openacs-4/packages/project-manager/www/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/project-manager/www/tasks.adp	25 Oct 2005 23:06:00 -0000	1.7
+++ openacs-4/packages/project-manager/www/tasks.adp	27 Oct 2005 21:48:03 -0000	1.8
@@ -11,7 +11,25 @@
 <table>
 <tr valign=top>
 <td>
-  <include src="/packages/project-manager/lib/tasks" project_item_id="@project_item_id@" status_id="@status_id@" party_id="@party_id@" actions_p="1" fmt=@fmt@ instance_id=@instance_id@ is_observer_p=@is_observer_p@ page_size="@page_size@" page="@page@" page_num="@page_num@" base_url="@base_url@" searchterm="@searchterm@" orderby="@orderby@" role_id="@role_id@" filter_package_id="@filter_package_id@" subproject_tasks="@subproject_tasks@">
+  <include src="/packages/project-manager/lib/tasks" 
+	project_item_id="@project_item_id@" 
+	status_id="@status_id@" 
+	party_id="@party_id@" 
+	actions_p="1" 
+	fmt="@fmt@"
+	instance_id="@instance_id@"
+	is_observer_p="@is_observer_p@" 
+	page_size="@page_size@" 
+	page="@page@"
+	page_num="@page_num@" 
+	base_url="@base_url@" 
+	searchterm="@searchterm@" 
+	orderby="@orderby@" 
+	role_id="@role_id@" 
+	filter_package_id="@filter_package_id@" 
+	subproject_tasks="@subproject_tasks@"
+	orderby_p="1"
+	/>
 </td>
 </tr>
 </table>