Index: openacs-4/packages/bug-tracker/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/bug-tracker/www/index.tcl 29 Aug 2002 11:31:49 -0000 1.3 +++ openacs-4/packages/bug-tracker/www/index.tcl 29 Aug 2002 13:03:46 -0000 1.4 @@ -12,6 +12,7 @@ priority:integer,optional assignee:integer,optional component_id:integer,optional + {orderby ""} } ad_require_permission [ad_conn package_id] read @@ -45,7 +46,7 @@ set where_clauses [list] -set filter_vars { status fix_for_vresion assignee component_id } +set filter_vars { status fix_for_version assignee component_id } if { [info exists status] } { lappend where_clauses "b.status = :status" @@ -98,6 +99,20 @@ } } +switch -exact -- $orderby { + severity { + set order_by_clause "sc.sort_order, b.bug_number desc" + append human_readable_filter ", most severe bugs first" + } + priority { + set order_by_clause "pc.sort_order, b.bug_number desc" + append human_readable_filter ", highest priority bugs first" + } + default { + set order_by_clause "b.bug_number desc" + } +} + db_multirow -extend { description_short submitter_url status_pretty resolution_pretty bug_type_pretty original_esimate_pretty latest_estimate_pretty elapsed_time_pretty assignee_url bug_url } bugs bugs " select b.bug_id, b.bug_number, @@ -153,7 +168,7 @@ and b.project_id = :package_id and submitter.user_id = o.creation_user [ad_decode $where_clauses "" "" "and [join $where_clauses " and "]"] - order by b.bug_number desc + order by $order_by_clause " { set description_short [bug_tracker::string_truncate [bug_tracker::bug_convert_comment_to_text -comment $description -format $desc_format]] set submitter_url [acs_community_member_url -user_id $submitter_user_id] @@ -211,6 +226,13 @@ set name_url "?[export_vars -url { { fix_for_version $unique_id } }]" } +set stat_name_val "Severity" +if { ![string equal $orderby "severity"] } { + append stat_name_val " (order)" +} else { + append stat_name_val " (*)" +} + db_multirow -extend { name_url stat_name } -append stats stats { select b.severity as unique_id, p.sort_order || ' - ' || p.severity_name as name, @@ -222,10 +244,17 @@ group by unique_id, name order by name } { - set stat_name "Severity" - set name_url "?[export_vars -url { { severity $unique_id } }]" + set stat_name $stat_name_val + set name_url "?[export_vars { { severity $unique_id } }]" } +set stat_name_val "Priority" +if { ![string equal $orderby "priority"] } { + append stat_name_val " (order)" +} else { + append stat_name_val " (*)" +} + db_multirow -extend { name_url stat_name } -append stats stats { select b.priority as unique_id, p.sort_order || ' - ' || p.priority_name as name, @@ -237,8 +266,8 @@ group by unique_id, name order by name } { - set stat_name "Priority" - set name_url "?[export_vars -url { { priority $unique_id } }]" + set stat_name $stat_name_val + set name_url "?[export_vars { { priority $unique_id } }]" } db_multirow -extend { name_url stat_name } -append stats stats {