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.53 -r1.54 --- openacs-4/packages/project-manager/lib/tasks.tcl 3 May 2006 18:22:02 -0000 1.53 +++ openacs-4/packages/project-manager/lib/tasks.tcl 10 May 2006 19:40:52 -0000 1.54 @@ -16,7 +16,7 @@ # page The page to show on the paginate. # page_size The number of rows to display in the list # orderby_p Set it to 1 if you want to show the order by menu. -# orderby To sort the list using this orderby value +# orderby_tasks To sort the list using this orderby value # # For Project Manager Task Portlet: # --------------------------------- @@ -63,7 +63,7 @@ } if ![info exists orderby_p] { - set orderby_p 0 + set orderby_p 1 } if { ![exists_and_not_null tasks_portlet_p] } { @@ -229,8 +229,8 @@ where_clause "$project_item_where_clause" ] \ project_item_id [list \ - label "[_ project-manager.Project_1]" \ - where_clause "$project_item_where_clause" + label "[_ project-manager.Project_1]" \ + where_clause "$project_item_where_clause" ] \ instance_id [list \ where_clause "o.package_id = :instance_id" @@ -304,12 +304,12 @@ "${base_url}assign-myself" \ "[_ project-manager.Assign_myself_as_lead]"] - set bulk_action_export_vars [list [list return_url] [list project_item_id]] + } else { set bulk_actions [list] - set bulk_action_export_vars [list] } +set bulk_action_export_vars [list [list return_url] [list project_item_id]] # Orderby's to use in if { $orderby_p } { set order_by_list [list \ @@ -338,6 +338,11 @@ orderby_asc "status asc, t.latest_finish desc, task_item_id" default_direction asc } \ + priority { + orderby_asc "priority, earliest_start, task_item_id asc" + orderby_desc "priority desc, earliest_start desc, task_item_id desc" + default_direction desc + } \ end_date { orderby_asc "end_date, task_item_id asc" orderby_desc "end_date desc, task_item_id desc" @@ -507,7 +512,7 @@ -page_size $page_size \ -page_flush_p 1 \ -page_query_name tasks_pagination \ - -orderby_name orderby \ + -orderby_name orderby_tasks \ -html { width 100% } \