Index: openacs.org-dev/packages/bug-tracker/lib/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/lib/master.adp,v diff -u -r1.1 -r1.2 --- openacs.org-dev/packages/bug-tracker/lib/master.adp 9 Jul 2002 17:35:01 -0000 1.1 +++ openacs.org-dev/packages/bug-tracker/lib/master.adp 4 Dec 2002 16:13:06 -0000 1.2 @@ -5,25 +5,24 @@ .bt_navbar { font-family: tahoma,verdana,arial,helvetica; font-size: 70%; font-weight: bold; color: #ccccff; text-decoration: none; } A.bt_navbar { color: white; } .bt_navbar:hover { color: white; text-decoration: underline; } + .bt_navbar:visited {color: white; text-decoration: none; } INPUT.bt_navbar { font-family: tahoma,verdana,arial,helvetica; font-weight: bold; font-size: 70%; color: black; } .bt_summary { font-size: 70%; font-family: verdana,arial,helvetica; } .bt_summary_bold { font-size: 70%; font-family: verdana,arial,helvetica; font-weight: bold; } + pre { font-family: Courier; font-size: 10pt; } @signatory @focus@ +/packages/bug-tracker/lib/version-bar +@context_bar@ - -

@header@

-@context_bar@ -
+ - -

- + Index: openacs.org-dev/packages/bug-tracker/lib/nav-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/lib/nav-bar.adp,v diff -u -r1.1 -r1.2 --- openacs.org-dev/packages/bug-tracker/lib/nav-bar.adp 9 Jul 2002 17:35:01 -0000 1.1 +++ openacs.org-dev/packages/bug-tracker/lib/nav-bar.adp 4 Dec 2002 16:13:06 -0000 1.2 @@ -1,6 +1,15 @@ - +
+
+ + + + +
+   @notification_label@ +
+ 		Index: openacs.org-dev/packages/bug-tracker/lib/version-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/lib/version-bar.adp,v diff -u -r1.1 -r1.2 --- openacs.org-dev/packages/bug-tracker/lib/version-bar.adp 9 Jul 2002 17:35:01 -0000 1.1 +++ openacs.org-dev/packages/bug-tracker/lib/version-bar.adp 4 Dec 2002 16:13:06 -0000 1.2 @@ -1,4 +1,4 @@ -
+
- + - +
@user_first_names@ @user_last_name@ Index: openacs.org-dev/packages/bug-tracker/tcl/bug-tracker-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs.org-dev/packages/bug-tracker/tcl/bug-tracker-procs.tcl 16 Nov 2002 03:44:41 -0000 1.2 +++ openacs.org-dev/packages/bug-tracker/tcl/bug-tracker-procs.tcl 4 Dec 2002 16:13:18 -0000 1.3 @@ -656,29 +656,28 @@ set body "$body_start -Action: [bug_action_pretty $action $resolution] by [conn user_first_names] [conn user_last_name] - " +Action: [bug_action_pretty $action $resolution] by [conn user_first_names] [conn user_last_name] [conn user_email]\n" + if { ![empty_string_p $comment] } { - append body " -Comment: + append body "\nComment: -[bug_convert_comment_to_text -comment $comment -format $comment_format] - " +[bug_convert_comment_to_text -comment $comment -format $comment_format]\n" } } else { # The bug was patched - we use different text in this case - set subject "$subject_start was patched by [conn user_first_names] [conn user_last_name]" + set subject "$subject_start patch by [conn user_first_names] [conn user_last_name]" set body "$body_start -A patch with summary \"$patch_summary\" has been entered for this bug." +Patch submitted by [conn user_first_names] [conn user_last_name] [conn user_email] + +$patch_summary\n" } - append body " -[ad_url][ad_conn package_url]bug?[export_vars -url { { bug_number $bug(bug_number) } }] - " + append body "\n[ad_url][ad_conn package_url]bug?[export_vars -url { { bug_number $bug(bug_number) } }]\n" + # Use the Notification service to alert (could be immediately, or daily, or weekly) # people who have signed up for notification on this bug notification::new \ Index: openacs.org-dev/packages/bug-tracker/www/bug-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/www/bug-add.tcl,v diff -u -r1.2 -r1.3 --- openacs.org-dev/packages/bug-tracker/www/bug-add.tcl 5 Nov 2002 17:36:48 -0000 1.2 +++ openacs.org-dev/packages/bug-tracker/www/bug-add.tcl 4 Dec 2002 16:13:28 -0000 1.3 @@ -8,6 +8,7 @@ cancel:optional {component_id ""} {return_url ""} + {version ""} } if { [empty_string_p $return_url] } { @@ -108,8 +109,8 @@ element set_properties bug bug_id -value [db_nextval "acs_object_id_seq"] element set_properties bug found_in_version \ - -value [bug_tracker::conn user_version_id] - + -value [bug_tracker::conn user_version_id] + element set_properties bug severity -value [bug_tracker::severity_get_default] element set_properties bug priority -value [bug_tracker::priority_get_default] Index: openacs.org-dev/packages/bug-tracker/www/bug.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/www/bug.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/packages/bug-tracker/www/bug.tcl 9 Jul 2002 17:35:01 -0000 1.1 +++ openacs.org-dev/packages/bug-tracker/www/bug.tcl 4 Dec 2002 16:13:28 -0000 1.2 @@ -2,31 +2,40 @@ Shows one bug. @author Lars Pind (lars@pinds.com) - @date 2002-03-20 + @creation-date 2002-03-20 @cvs-id $Id$ } { mode:optional bug_number:integer,notnull edit:optional + comment:optional + reassign:optional resolve:optional reopen:optional cancel:optional close:optional + {user_agent_p:boolean 0} + {show_patch_status "open"} + filter:array,optional } -set return_url "bug?[export_vars -url { bug_number }]" +set return_url "[ad_conn url]?[export_vars -url { bug_number filter:array }]" # If the user hit cancel, ignore everything else if { [exists_and_not_null cancel] } { ad_returnredirect $return_url - return + ad_script_abort } ad_require_permission [ad_conn package_id] read if { ![info exists mode] } { if { [exists_and_not_null edit] } { set mode "edit" + } elseif { [exists_and_not_null comment] } { + set mode "comment" + } elseif { [exists_and_not_null reassign] } { + set mode "reassign" } elseif { [exists_and_not_null resolve] } { set mode "resolve" } elseif { [exists_and_not_null reopen] } { @@ -42,6 +51,12 @@ edit { set edit_fields { component_id bug_type summary severity priority found_in_version assignee fix_for_version resolution fixed_in_version } } + comment { + set edit_fields {} + } + reassign { + set edit_fields { assignee } + } resolve { set edit_fields { resolution fixed_in_version } } @@ -61,12 +76,60 @@ set write_p [ad_permission_p [ad_conn package_id] write] -set project_name [bt_conn project_name] +set project_name [bug_tracker::conn project_name] set package_id [ad_conn package_id] set package_key [ad_conn package_key] set user_id [ad_conn user_id] + +# +# Filter management +# + +set filter_parsed [bug_tracker::parse_filters filter] + +if { [string equal $mode view] } { + + set human_readable_filter [bug_tracker::conn filter_human_readable] + set where_clauses [bug_tracker::conn filter_where_clauses] + set order_by_clause [bug_tracker::conn filter_order_by_clause] + + lappend where_clauses "b.project_id = :package_id" + + set filter_bug_numbers [db_list filter_bug_numbers " + select bug_number + from bt_bugs b join + acs_objects o on (object_id = bug_id) join + bt_priority_codes pc on (pc.priority_id = b.priority) join + bt_severity_codes sc on (sc.severity_id = b.severity) + where [join $where_clauses " and "] + order by $order_by_clause + "] + + set filter_bug_index [lsearch -exact $filter_bug_numbers $bug_number] + + multirow create navlinks url label + + if { $filter_bug_index != -1 } { + + if { $filter_bug_index > 0 } { + multirow append navlinks "bug?[export_vars { { bug_number {[lindex $filter_bug_numbers [expr $filter_bug_index -1]]} } filter:array }]" "<" + } else { + multirow append navlinks "" "<" + } + + multirow append navlinks "" "[expr $filter_bug_index+1] of [llength $filter_bug_numbers]" + + if { $filter_bug_index < [expr [llength $filter_bug_numbers]-1] } { + multirow append navlinks "bug?[export_vars { { bug_number {[lindex $filter_bug_numbers [expr $filter_bug_index +1]]} } filter:array }]" ">" + } else { + multirow append navlinks "" ">" + } + } +} + + # Create the form switch -- $mode { @@ -91,13 +154,13 @@ -datatype integer \ -widget [ad_decode [info exists field_editable_p(component_id)] 1 select inform] \ -label "Component" \ - -options [bt_components_get_options] + -options [bug_tracker::components_get_options] element create bug bug_type \ -datatype text \ -widget [ad_decode [info exists field_editable_p(bug_type)] 1 select inform] \ -label "Type of bug" \ - -options [bt_bug_type_get_options] \ + -options [bug_tracker::bug_type_get_options] \ -optional element create bug summary \ @@ -114,65 +177,79 @@ element create bug status \ -widget [ad_decode [info exists field_editable_p(status)] 1 select inform] \ -datatype text \ - -options [bt_status_get_options] \ + -options [bug_tracker::status_get_options] \ -label "Status" element create bug resolution \ -widget [ad_decode [info exists field_editable_p(resolution)] 1 select inform] \ -datatype text \ -label "Resolution" \ - -options [ad_decode $mode resolve [bt_resolution_get_options] [concat {{"" ""}} [bt_resolution_get_options]]] \ + -options [ad_decode $mode resolve [bug_tracker::resolution_get_options] [concat {{"" ""}} [bug_tracker::resolution_get_options]]] \ -optional element create bug severity \ -datatype integer \ -widget [ad_decode [info exists field_editable_p(severity)] 1 select inform] \ -label "Severity" \ - -options [bt_severity_codes_get_options] \ + -options [bug_tracker::severity_codes_get_options] \ -optional element create bug priority \ -datatype integer \ -widget [ad_decode [info exists field_editable_p(priority)] 1 select inform] \ -label "Priority" \ - -options [bt_priority_codes_get_options] \ + -options [bug_tracker::priority_codes_get_options] \ -optional element create bug found_in_version \ -datatype text \ -widget [ad_decode [info exists field_editable_p(found_in_version)] 1 select inform] \ -label "Found in Version" \ - -options [bt_version_get_options -include_unknown] \ + -options [bug_tracker::version_get_options -include_unknown] \ -optional -element create bug user_agent \ +element create bug patches \ -datatype text \ - -widget inform \ - -label "User Agent" + -widget inform \ + -label [ad_decode $show_patch_status "open" "Open Patches (show all)" "all" "All Patches (show only open)" "Patches"] +if { $user_agent_p } { + element create bug user_agent \ + -datatype text \ + -widget inform \ + -label "User Agent" +} + element create bug assignee \ - -datatype integer \ - -widget [ad_decode [info exists field_editable_p(assignee)] 1 select inform] \ - -label "Assigned to" \ - -options [bt_users_get_options -include_unassigned] \ - -optional + -widget [ad_decode [info exists field_editable_p(assignee)] 1 search inform] \ + -datatype search \ + -result_datatype integer \ + -label {Assigned to} \ + -options [bug_tracker::users_get_options] \ + -optional \ + -search_query { + select distinct u.first_names || ' ' || u.last_name as name, u.user_id + from dir_all_users u + where upper(coalesce(u.first_names || ' ', '') || coalesce(u.last_name || ' ', '') || u.email || ' ' || coalesce(u.screen_name, '')) like upper('%'||:value||'%') + order by name +} element create bug fix_for_version \ -datatype text \ -widget [ad_decode [info exists field_editable_p(fix_for_version)] 1 select inform] \ -label "Fix for Version" \ - -options [bt_version_get_options -include_undecided] \ + -options [bug_tracker::version_get_options -include_undecided] \ -optional element create bug fixed_in_version \ -datatype text \ -widget [ad_decode [info exists field_editable_p(fixed_in_version)] 1 select inform] \ -label "Fixed in Version" \ - -options [bt_version_get_options -include_undecided] \ + -options [bug_tracker::version_get_options -include_undecided] \ -optional switch -- $mode { - edit - resolve - reopen - close { + edit - comment - reassign - resolve - reopen - close { element create bug description \ -datatype text \ -widget comment \ @@ -206,11 +283,17 @@ -widget hidden \ -value $mode +foreach name [array names filter] { + element create bug filter.$name -datatype text -widget hidden -value $filter($name) +} + # If nothing else ... set page_title "Bug #$bug_number" -if { [form is_request bug] } { - +set show_user_agent_url "bug?[export_vars { bug_number { user_agent_p 1 }}]" +set hide_user_agent_url "bug?[export_vars { bug_number }]" + +if { ![form is_valid bug] } { db_1row bug { select b.bug_id, b.bug_number, @@ -246,18 +329,18 @@ coalesce((select version_name from bt_versions fixed_in_v where fixed_in_v.version_id = b.fixed_in_version), 'Unknown') as fixed_in_version_name, - b.assignee as assignee_user_id, - assignee.first_names as assignee_first_names, - assignee.last_name as assignee_last_name, - assignee.email as assignee_email, + b.assignee, + asgnu.first_names as assignee_first_names, + asgnu.last_name as assignee_last_name, + asgnu.email as assignee_email, to_char(now(), 'fmMM/DDfm/YYYY') as now_pretty from bt_bugs b left outer join - cc_users assignee on (assignee.user_id = b.assignee), + dir_all_users asgnu on (asgnu.user_id = b.assignee), acs_objects o, bt_components c, bt_priority_codes pc, bt_severity_codes sc, - cc_users submitter + dir_all_users submitter where b.bug_number = :bug_number and b.project_id = :package_id and o.object_id = b.bug_id @@ -276,51 +359,31 @@ } } - element set_properties bug bug_number \ - -value $bug(bug_number) - element set_properties bug bug_number_i \ - -value $bug(bug_number) - element set_properties bug component_id \ - -value [ad_decode [info exists field_editable_p(component_id)] 1 $bug(component_id) $bug(component_name)] - element set_properties bug bug_type \ - -value [ad_decode [info exists field_editable_p(bug_type)] 1 $bug(bug_type) [bt_bug_type_pretty $bug(bug_type)]] - element set_properties bug summary \ - -value [ad_decode [info exists field_editable_p(summary)] 1 $bug(summary) "$bug(summary)"] - element set_properties bug submitter \ - -value " - [acs_community_member_link -user_id $bug(submitter_user_id) \ - -label "$bug(submitter_first_names) $bug(submitter_last_name)"] - ($bug(submitter_email))" - element set_properties bug status \ - -value [ad_decode [info exists field_editable_p(status)] 1 $bug(status) [bt_status_pretty $bug(status)]] - element set_properties bug resolution \ - -value [ad_decode [info exists field_editable_p(resolution)] 1 $bug(resolution) [bt_resolution_pretty $bug(resolution)]] - element set_properties bug severity \ - -value [ad_decode [info exists field_editable_p(severity)] 1 $bug(severity) $bug(severity_pretty)] - element set_properties bug priority \ - -value [ad_decode [info exists field_editable_p(priority)] 1 $bug(priority) $bug(priority_pretty)] - element set_properties bug found_in_version \ - -value [ad_decode [info exists field_editable_p(found_in_version)] 1 $bug(found_in_version) $bug(found_in_version_name)] - element set_properties bug user_agent \ - -value $bug(user_agent) - element set_properties bug fix_for_version \ - -value [ad_decode [info exists field_editable_p(fix_for_version)] 1 $bug(fix_for_version) $bug(fix_for_version_name)] - element set_properties bug fixed_in_version \ - -value [ad_decode [info exists field_editable_p(fixed_in_version)] 1 $bug(fixed_in_version) $bug(fixed_in_version_name)] - element set_properties bug assignee \ - -value [ad_decode [info exists field_editable_p(assignee)] 1 $bug(assignee_user_id) \ - [ad_decode $bug(assignee_user_id) "" "Unassigned" " - [acs_community_member_link -user_id $bug(assignee_user_id) \ - -label "$bug(assignee_first_names) $bug(assignee_last_name)"] - ($bug(assignee_email))"]] + set pretty(bug_number) "#$bug(bug_number)" + set pretty(component_id) $bug(component_name) + set pretty(bug_type) [bug_tracker::bug_type_pretty $bug(bug_type)] + set pretty(summary) "$bug(summary)" + set pretty(submitter) "[acs_community_member_link -user_id $bug(submitter_user_id) \ + -label "$bug(submitter_first_names) $bug(submitter_last_name)" \ + ] ($bug(submitter_email))" + set pretty(status) [bug_tracker::status_pretty $bug(status)] + set pretty(resolution) [bug_tracker::resolution_pretty $bug(resolution)] + set pretty(severity) $bug(severity_pretty) + set pretty(priority) $bug(priority_pretty) + set pretty(found_in_version) $bug(found_in_version_name) + set pretty(patches) "[bug_tracker::get_patch_links -bug_id $bug(bug_id) -show_patch_status $show_patch_status]   \[ Upload a patch \]" + set pretty(user_agent) $bug(user_agent) + set pretty(fix_for_version) $bug(fix_for_version_name) + set pretty(fixed_in_version) $bug(fixed_in_version_name) + set pretty(assignee) [ad_decode $bug(assignee) "" "Unassigned" " + [acs_community_member_link -user_id $bug(assignee) \ + -label "$bug(assignee_first_names) $bug(assignee_last_name)"] + ($bug(assignee_email))"] +} +if { [form is_request bug] } { + element set_properties bug bug_number -value $bug(bug_number) - if { ( [string equal $bug(status) open] && ![string equal $mode "resolve"]) \ - || [string equal $mode "reopen"] } { - element set_properties bug resolution -widget hidden - element set_properties bug fixed_in_version -widget hidden - } - # Description/Actions/History set bug_id $bug(bug_id) @@ -330,6 +393,7 @@ db_foreach actions { select ba.action_id, ba.action, + ba.resolution, ba.actor as actor_user_id, actor.first_names as actor_first_names, actor.last_name as actor_last_name, @@ -339,32 +403,41 @@ ba.comment, ba.comment_format from bt_bug_actions ba, - cc_users actor + dir_all_users actor where ba.bug_id = :bug_id and actor.user_id = ba.actor order by action_date } { - append action_html "$action_date_pretty [bt_bug_action_pretty $action] by $actor_first_names $actor_last_name -
[bt_bug_convert_comment_to_html -comment $comment -format $comment_format]
" + append action_html "$action_date_pretty [bug_tracker::bug_action_pretty $action $resolution] by $actor_first_names $actor_last_name +
[bug_tracker::bug_convert_comment_to_html -comment $comment -format $comment_format]
" } if { [string equal $mode "view"] } { element set_properties bug description -value $action_html } else { element set_properties bug description \ -history $action_html \ - -header "$bug(now_pretty) [bt_bug_action_pretty $mode] by [bt_conn user_first_names] [bt_conn user_last_name]" \ + -header "$bug(now_pretty) [bug_tracker::bug_action_pretty $mode] by [bug_tracker::conn user_first_names] [bug_tracker::conn user_last_name]" \ -value "" } set page_title "Bug #$bug_number: $bug(summary)" + # If the user has submitted the bug he gets full write access on the bug + set write_p [expr $write_p || ($bug(submitter_user_id) == [ad_conn user_id])] + if { !$write_p && [info exists bug(assignee)] && $bug(assignee) == [ad_conn user_id] } { + set write_p 1 + } + if { [string equal $mode "view"] && $write_p } { - set button_form_export_vars [export_vars -form { bug_number }] + set button_form_export_vars [export_vars -form { bug_number filter:array }] multirow create button name label + multirow append button "comment" "Comment" multirow append button "edit" "Edit" + switch -- $bug(status) { open { + multirow append button "reassign" "Reassign" multirow append button "resolve" "Resolve" } resolved { @@ -378,19 +451,112 @@ } } + if { ![string equal $mode "view"] && !$write_p } { + ns_log notice "[ad_conn user_id] doesn't have write on object $bug(bug_id)" + ad_return_forbidden "Security Violation" "
+ You don't have permission to edit this bug. +
+ This incident has been logged. +
" + ad_script_abort + } +} + +if { ![form is_valid bug] } { + # set the values of all the inform widgets + + element set_properties bug bug_number_i -value $pretty(bug_number) + + foreach element { + component_id bug_type summary submitter status resolution severity + priority found_in_version patches user_agent fix_for_version fixed_in_version assignee + } { + # check that the element exists + if { [info exists bug:$element] } { + if { [info exists field_editable_p($element)] } { + if { [form is_request bug] } { + element set_value bug $element $bug($element) + } + } else { + element set_value bug $element $pretty($element) + } + } + } + + if { [string equal $bug(status) "open"] && ![string equal $mode "resolve"] || [string equal $mode "reopen"] } { + element set_properties bug resolution -widget hidden + element set_properties bug fixed_in_version -widget hidden + } + +} + + + +# Notifications for a project. Provide a link for logged in users in view mode +if { [string equal $mode "view"] } { + set notification_link [bug_tracker::get_notification_link \ + -type bug_tracker_project_notif \ + -object_id $bug(bug_id) \ + -url $return_url \ + -pretty_name "bug"] +} else { + set notification_link "" } + -set context_bar [ad_context_bar $page_title] +if { [info exists filter] } { + if { [array names filter] == [list "actionby"] && $filter(actionby) == [ad_conn user_id] } { + set context_bar [bug_tracker::context_bar [list ".?[export_vars { filter:array }]" "My bugs"] $page_title] + } else { + set context_bar [bug_tracker::context_bar [list ".?[export_vars { filter:array }]" "Filtered bug list"] $page_title] + } +} else { + set context_bar [bug_tracker::context_bar $page_title] +} if { [form is_valid bug] } { - # Require write permission here, just to make sure not DML statement is executed without write permission - ad_require_permission [ad_conn package_id] write + # Find out whether the user has permission to modify + if { !$write_p } { + # No write permission, is this the submitter? + db_1row submitter { + select o.creation_user as submitter_user_id, + b.bug_id, + b.assignee + from bt_bugs b, + acs_objects o + where o.object_id = b.bug_id + and b.bug_number = :bug_number + and b.project_id = :package_id + } -column_array bug + + # If the user has submitted the bug he gets full write access on the bug + if { [info exists bug(submitter_user_id)] && ($bug(submitter_user_id) == [ad_conn user_id]) } { + set write_p 1 + } + + if { [info exists bug(assignee)] && ($bug(assignee) == [ad_conn user_id]) } { + set write_p 1 + } + } + + if { !$write_p && ![string equal $mode "comment"] } { + ns_log notice "$bug(submitter_user_id) doesn't have write on object $bug(bug_id)" + ad_return_forbidden \ + "Security Violation" \ + "
+ You don't have permission to edit this bug. +
+ This incident has been logged. +
" + ad_script_abort + } + set update_exprs [list] foreach column $edit_fields { - set $column [element::get_value bug $column] + set $column [element get_value bug $column] lappend update_exprs "$column = :$column" } @@ -409,31 +575,45 @@ } } + if { ![info exists resolution] || ![string equal $mode "resolve"] } { + set resolution {} + } + db_transaction { - set bug_id [db_string bug_id { select bug_id from bt_bugs where bug_number = :bug_number and project_id = :package_id }] + set bug_id [bug_tracker::get_bug_id -bug_number $bug_number -project_id $package_id] - db_dml update_bug "update bt_bugs \n set [join $update_exprs ",\n "] \n where bug_id = :bug_id" + if { [llength $update_exprs] > 0 } { + db_dml update_bug "update bt_bugs \n set [join $update_exprs ",\n "] \n where bug_id = :bug_id" + } - set action_id [db_nextval "acs_object_id_seq"] set user_id [ad_conn user_id] foreach column { description desc_format } { - set $column [element::get_value bug $column] + set $column [element get_value bug $column] } db_dml bug_action { insert into bt_bug_actions - (action_id, bug_id, action, actor, comment, comment_format) + (action_id, bug_id, action, resolution, actor, comment, comment_format) values - (:action_id, :bug_id, :mode, :user_id, :description, :desc_format) + (:action_id, :bug_id, :mode, :resolution, :user_id, :description, :desc_format) } + + # Setup any assignee for alerts on the bug + if { [info exists assignee] && ![empty_string_p $assignee] } { + bug_tracker::add_instant_alert -bug_id $bug_id -user_id $assignee + } } - bt_bug_notify $bug_id $mode $description $desc_format + bug_tracker::bug_notify -bug_id $bug_id \ + -action $mode \ + -comment $description \ + -comment_format $desc_format \ + -resolution $resolution ad_returnredirect $return_url - return + ad_script_abort } ad_return_template Index: openacs.org-dev/packages/bug-tracker/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/www/index.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/packages/bug-tracker/www/index.tcl 9 Jul 2002 17:35:01 -0000 1.1 +++ openacs.org-dev/packages/bug-tracker/www/index.tcl 4 Dec 2002 16:13:28 -0000 1.2 @@ -2,28 +2,32 @@ Bug listing page. @author Lars Pind (lars@pinds.com) - @date 2002-03-20 + @creation-date 2002-03-20 @cvs-id $Id$ } { - {status:optional "open"} - bug_type:optional - fix_for_version:integer,optional - severity:integer,optional - priority:integer,optional - assignee:integer,optional - component_id:integer,optional + filter:optional,array } ad_require_permission [ad_conn package_id] read -set project_name [bt_conn project_name] +set project_name [bug_tracker::conn project_name] set package_id [ad_conn package_id] set package_key [ad_conn package_key] -set context_bar [ad_context_bar] +if { [info exists filter] } { + if { [array names filter] == [list "actionby"] && $filter(actionby) == [ad_conn user_id] } { + set context_bar [bug_tracker::context_bar "My bugs"] + } else { + set context_bar [bug_tracker::context_bar "Filtered bug list"] + } +} else { + set context_bar [bug_tracker::context_bar] +} set admin_p [ad_permission_p [ad_conn package_id] admin] +set return_url "[ad_conn url][ad_decode [ad_conn query] "" "" "?[ad_conn query]"]" + set num_components [db_string num_components { select count(component_id) from bt_components where project_id = :package_id }] if { $num_components == 0 } { @@ -38,66 +42,59 @@ return } +set user_id [ad_conn user_id] +# Notifications for a project. Provide a link for logged in users +set notification_link [bug_tracker::get_notification_link \ + -type bug_tracker_project_notif \ + -object_id $package_id \ + -url $return_url \ + -pretty_name "project"] + # # Filter management # -set where_clauses [list] +set filter_parsed [bug_tracker::parse_filters filter] -set filter_vars { status fix_for_vresion assignee component_id } +set human_readable_filter [bug_tracker::conn filter_human_readable] +set where_clauses [bug_tracker::conn filter_where_clauses] +set order_by_clause [bug_tracker::conn filter_order_by_clause] -if { [info exists status] } { - lappend where_clauses "b.status = :status" - set human_readable_filter "All $status bugs" -} else { - set human_readable_filter "All bugs" -} +lappend where_clauses "b.project_id = :package_id" -if { [info exists bug_type] } { - lappend where_clauses "b.bug_type = :bug_type" - append human_readable_filter " of type [bt_bug_type_pretty $bug_type]" +if { [llength [array names filter]] > 0 } { + set clear_url [ad_conn package_url] } -if { [info exists assignee] } { - if { [empty_string_p $assignee] } { - lappend where_clauses "b.assignee is null" - append human_readable_filter " that are unassigned" - } else { - lappend where_clauses "b.assignee = :assignee" - if { $assignee == [ad_conn user_id] } { - append human_readable_filter " assigned to me" - } else { - append human_readable_filter " assigned to [db_string assignee_name { select first_names || ' ' || last_name from cc_users where user_id = :assignee }]" - } - } -} +# +# Order by +# -if { [info exists severity] } { - lappend where_clauses "b.severity = :severity" - append human_readable_filter " where severity is [db_string severity_name { select severity_name from bt_severity_codes where severity_id = :severity }]" +if { [info exists filter(orderby)] } { + set save_orderby $filter(orderby) + unset filter(orderby) } - -if { [info exists priority] } { - lappend where_clauses "b.priority = :priority" - append human_readable_filter " with a priority of [db_string priority_name { select priority_name from bt_priority_codes where priority_id = :priority }]" +set displaymode_form_export_vars [export_vars -form { filter:array }] +if { [info exists save_orderby] } { + set filter(orderby) $save_orderby + unset save_orderby } -if { [info exists component_id] } { - lappend where_clauses "b.component_id = :component_id" - append human_readable_filter " in [db_string component_name { select component_name from bt_components where component_id = :component_id }]" -} - -if { [info exists fix_for_version] } { - if { [empty_string_p $fix_for_version] } { - lappend where_clauses "b.fix_for_version is null" - append human_readable_filter " where fix for version is undecided" +multirow create orderby value label selected_p +foreach value { "" severity priority } label { "Bug number" "Severity" "Priority" } { + if { [info exists filter(orderby)] && [string equal $filter(orderby) $value] } { + set selected_p 1 } else { - lappend where_clauses "b.fix_for_version = :fix_for_version" - append human_readable_filter " to be fixed in version [db_string version_name { select version_name from bt_versions where version_id = :fix_for_version }]" + set selected_p 0 } + multirow append orderby $value $label $selected_p } +# +# Get bug list +# + set truncate_len [ad_parameter "TruncateDescriptionLength" -default 200] 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 " @@ -139,41 +136,40 @@ assignee.last_name as assignee_last_name, assignee.email as assignee_email from bt_bugs b left outer join - cc_users assignee on (assignee.user_id = b.assignee), + dir_all_users assignee on (assignee.user_id = b.assignee), bt_bug_actions bact, bt_components c, acs_objects o, bt_priority_codes pc, bt_severity_codes sc, - cc_users submitter + dir_all_users submitter where c.component_id = b.component_id and bact.bug_id = b.bug_id and bact.action = 'open' and o.object_id = b.bug_id and pc.priority_id = b.priority and sc.severity_id = b.severity - 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 + and [join $where_clauses " and "] + order by $order_by_clause " { - set desc_as_text [bt_bug_convert_comment_to_text -comment $description -format $desc_format] - if { [string length $desc_as_text] > $truncate_len } { - set description_short "[util_close_html_tags [string range $desc_as_text 0 $truncate_len]]..." - } else { - set description_short [util_close_html_tags $desc_as_text] - } + set description_short [string_truncate -len $truncate_len -format $desc_format $description] + set summary [ad_quotehtml $summary] set submitter_url [acs_community_member_url -user_id $submitter_user_id] - set status_pretty [bt_status_pretty $status] - set resolution_pretty [bt_resolution_pretty $resolution] - set bug_type_pretty [bt_bug_type_pretty $bug_type] + set status_pretty [bug_tracker::status_pretty $status] + set resolution_pretty [bug_tracker::resolution_pretty $resolution] + set bug_type_pretty [bug_tracker::bug_type_pretty $bug_type] set original_estimate_pretty [ad_decode $original_estimate_minutes "" "" 0 "" "$original_estimate_minutes minutes"] set latest_estimate_pretty [ad_decode $latest_estimate_minutes "" "" 0 "" "$latest_estimate_minutes minutes"] set elapsed_time_pretty [ad_decode $elapsed_time_minutes "" "" 0 "" "$elapsed_time_minutes minutes"] set assignee_url [acs_community_member_url -user_id $assignee_user_id] - set bug_url "bug?[export_vars -url { bug_number }]" + set bug_url "bug?[export_vars { bug_number filter:array }]" } +# +# Get stats +# + db_multirow -extend { name name_url } by_status by_status { select b.status as unique_id, count(b.bug_id) as num_bugs @@ -182,11 +178,11 @@ group by unique_id order by bt_bug__status_sort_order(b.status) } { - set name "[bt_status_pretty $unique_id] Bugs" - set name_url "?[export_vars -url { { status $unique_id } }]" + set name "[bug_tracker::status_pretty $unique_id] Bugs" + set name_url "?[export_vars { { filter.status $unique_id } }]" } -db_multirow -extend { name name_url stat_name } stats stats { +db_multirow -extend { name name_url stat_name } stats stats_by_bug_type { select b.bug_type as unique_id, count(b.bug_id) as num_bugs from bt_bugs b @@ -196,11 +192,11 @@ order by bt_bug__bug_type_sort_order(b.bug_type) } { set stat_name "Type of bug" - set name [bt_bug_type_pretty $unique_id] - set name_url "?[export_vars -url { { bug_type $unique_id } }]" + set name [bug_tracker::bug_type_pretty $unique_id] + set name_url "?[export_vars { { filter.bug_type $unique_id } }]" } -db_multirow -extend { name_url stat_name } -append stats stats { +db_multirow -extend { name_url stat_name } -append stats stats_by_fix_for_version { select b.fix_for_version as unique_id, v.version_name as name, count(b.bug_id) as num_bugs @@ -215,10 +211,12 @@ if { [empty_string_p $unique_id] } { set name "Undecided" } - set name_url "?[export_vars -url { { fix_for_version $unique_id } }]" + set name_url "?[export_vars { { filter.fix_for_version $unique_id } }]" } -db_multirow -extend { name_url stat_name } -append stats stats { +set stat_name_val "Severity" + +db_multirow -extend { name_url stat_name } -append stats stats_by_severity { select b.severity as unique_id, p.sort_order || ' - ' || p.severity_name as name, count(b.bug_id) as num_bugs @@ -229,11 +227,13 @@ 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 { { filter.severity $unique_id } }]" } -db_multirow -extend { name_url stat_name } -append stats stats { +set stat_name_val "Priority" + +db_multirow -extend { name_url stat_name } -append stats stats_by_priority { select b.priority as unique_id, p.sort_order || ' - ' || p.priority_name as name, count(b.bug_id) as num_bugs @@ -244,30 +244,52 @@ 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 { { filter.priority $unique_id } }]" } -db_multirow -extend { name_url stat_name } -append stats stats { - select b.assignee as unique_id, - assignee.first_names || ' ' || assignee.last_name as name, - count(b.bug_id) as num_bugs - from bt_bugs b left outer join - cc_users assignee on (assignee.user_id = b.assignee) - where b.project_id = :package_id - and b.status = 'open' - group by unique_id, name - order by name +db_multirow -extend { name_url stat_name } -append stats stats_by_assignee { +SELECT bc.unique_id,cc.first_names || ' ' || cc.last_name as name, bc.num_bugs + FROM (SELECT b.assignee as unique_id,count(b.bug_id) as num_bugs + FROM bt_bugs b + WHERE b.project_id = :package_id + and b.status = 'open' + and b.assignee is not null + GROUP BY b.assignee) as bc, + persons cc + WHERE bc.unique_id = cc.person_id +UNION +SELECT null,null,count(*) + FROM bt_bugs where assignee is null + and project_id = :package_id + and status = 'open' +ORDER BY name } { set stat_name "Assigned To" if { [empty_string_p $unique_id] } { set name "Unassigned" } - set name_url "?[export_vars -url { { assignee $unique_id } }]" + set name_url "?[export_vars -url { { filter.assignee $unique_id } }]" } -db_multirow -extend { name_url stat_name } -append stats stats { - select b.component_id as unique_id, +db_multirow -extend { name_url stat_name } -append stats stats_by_actionby { + select o.creation_user as unique_id, + submitter.first_names || ' ' || submitter.last_name as name, + count(b.bug_id) as num_bugs + from bt_bugs b join + acs_objects o on (object_id = bug_id) join + dir_all_users submitter on (submitter.user_id = o.creation_user) + where b.project_id = :package_id + and b.status = 'resolved' + group by unique_id, name + order by name +} { + set stat_name "To Be Verified By" + set name_url "?[export_vars -url { { filter.status resolved } { filter.actionby $unique_id } }]" +} + +db_multirow -extend { name_url stat_name } -append stats stats_by_component { + select coalesce('com/'||c.url_name||'/', trim(to_char(c.component_id,'99999999'))) as unique_id, c.component_name as name, count(b.bug_id) as num_bugs from bt_bugs b left join @@ -278,7 +300,11 @@ order by name } { set stat_name "Components" - set name_url "?[export_vars -url { { component_id $unique_id } }]" + if { [string match "com/*" $unique_id] } { + set name_url "[ad_conn package_url]$unique_id" + } else { + set name_url "[ad_conn package_url]?[export_vars -url { { filter.component_id $unique_id } }]" + } } ad_return_template Index: openacs.org-dev/packages/bug-tracker/www/patch.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/www/patch.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/packages/bug-tracker/www/patch.tcl 8 Oct 2002 15:46:57 -0000 1.1 +++ openacs.org-dev/packages/bug-tracker/www/patch.tcl 4 Dec 2002 16:13:28 -0000 1.2 @@ -282,7 +282,7 @@ to_char(now(), 'fmMM/DDfm/YYYY') as now_pretty from bt_patches, acs_objects, - cc_users submitter, + dir_all_users submitter, bt_components where bt_patches.patch_number = :patch_number @@ -358,7 +358,7 @@ bt_patch_actions.comment, bt_patch_actions.comment_format from bt_patch_actions, - cc_users actor + dir_all_users actor where bt_patch_actions.patch_id = :patch_id and actor.user_id = bt_patch_actions.actor order by action_date Index: openacs.org-dev/packages/bug-tracker/www/admin/component-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/www/admin/component-ae.tcl,v diff -u -r1.1 -r1.2 --- openacs.org-dev/packages/bug-tracker/www/admin/component-ae.tcl 9 Jul 2002 17:35:01 -0000 1.1 +++ openacs.org-dev/packages/bug-tracker/www/admin/component-ae.tcl 4 Dec 2002 16:13:38 -0000 1.2 @@ -1,22 +1,19 @@ ad_page_contract { @author Lars Pind (lars@pinds.com) - @date 2002-03-26 + @creation-date 2002-03-26 @cvs-id $Id$ } { cancel:optional component_id:integer,optional - name:optional - description:optional - maintainer:integer,optional {return_url ""} } if { [exists_and_not_null cancel] } { ad_returnredirect $return_url - return + ad_script_abort } -set project_name [bt_conn project_name] +set project_name [bug_tracker::conn project_name] set package_id [ad_conn package_id] set package_key [ad_conn package_key] @@ -27,71 +24,80 @@ } set context_bar [ad_context_bar $page_title] -template::form create component +form create component -template::element create component return_url -datatype text -widget hidden -value $return_url +element create component return_url -datatype text -widget hidden -value $return_url -template::element create component name \ +element create component name \ -datatype text \ -html { size 50 } \ -label "Component Name" -template::element create component description \ +element create component description \ -datatype text \ -widget textarea \ -label "Description" \ -optional \ -html { cols 50 rows 8 } -template::element create component maintainer \ +element create component url_name \ + -datatype text \ + -html { size 50 } \ + -label "Name in shortcut URL" \ + -optional + +element create component maintainer \ -datatype integer \ -widget select \ -label "Maintainer" \ - -options [concat {{ "--None--" "" }} [db_list_of_lists users { select first_names || ' ' || last_name, user_id from cc_users }]] -optional + -options [concat {{ "--None--" "" }} [db_list_of_lists users { select first_names || ' ' || last_name, user_id from cc_users order by last_name, first_names}]] -optional -template::element create component component_id \ +element create component component_id \ -datatype integer \ -widget hidden -if { [template::form is_request component] } { +if { [form is_request component] } { if { ![info exists component_id] } { - template::element set_properties component component_id -value [db_nextval "acs_object_id_seq"] + element set_properties component component_id -value [db_nextval "acs_object_id_seq"] } else { db_1row component_info { - select component_name as name, description, maintainer + select component_id, + component_name as name, + description, + maintainer, + url_name from bt_components where component_id = :component_id - } - template::element set_properties component component_id -value $component_id - template::element set_properties component name -value $name - template::element set_properties component description -value $description - template::element set_properties component maintainer -value $maintainer - + } -column_array component_info + form set_values component component_info } } -if { [template::form is_valid component] } { +if { [form is_valid component] } { + form get_values component name description maintainer url_name + set count [db_0or1row num_components { select 1 from bt_components where component_id = :component_id }] if { $count == 0 } { db_dml component_create { insert into bt_components - (component_id, project_id, component_name, description, maintainer) + (component_id, project_id, component_name, description, url_name, maintainer) values - (:component_id, :package_id, :name, :description, :maintainer) + (:component_id, :package_id, :name, :description, :url_name, :maintainer) } } else { db_dml component_update { update bt_components - set component_name = :name, - description = :description, - maintainer = :maintainer + set component_name = :name, + description = :description, + maintainer = :maintainer, + url_name = :url_name where component_id = :component_id } } ad_returnredirect $return_url - return + ad_script_abort } -ad_return_template \ No newline at end of file +ad_return_template Index: openacs.org-dev/packages/bug-tracker/www/admin/versions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bug-tracker/www/admin/versions.adp,v diff -u -r1.2 -r1.3 --- openacs.org-dev/packages/bug-tracker/www/admin/versions.adp 30 Oct 2002 01:44:45 -0000 1.2 +++ openacs.org-dev/packages/bug-tracker/www/admin/versions.adp 4 Dec 2002 16:13:38 -0000 1.3 @@ -93,23 +93,23 @@ 		Version Actual Freeze Actual ReleaseSupported Platforms MaintainerSupported Platforms
Edit @past_version.version_name@ @past_version.actual_freeze_date@ @past_version.actual_release_date@@past_version.supported_platforms@ @past_version.maintainer_first_names@ @past_version.maintainer_last_name@ None @past_version.supported_platforms@