Index: openacs-4/packages/bug-tracker/lib/one-bug.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/one-bug.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/bug-tracker/lib/one-bug.adp 26 Jul 2004 13:10:21 -0000 1.1 @@ -0,0 +1,20 @@ + + Display one bug + + @author Jeff Davis davis@xarg.net + @cvs-id $Id: one-bug.adp,v 1.1 2004/07/26 13:10:21 jeffd Exp $ + + @param bug array of values as returned from bug_tracker::bug::get + @param comments html chunk of comments + @param style string (either "feed" or "display" -- default is display) + @param base_url url to the package (ok for this to be empty if in the package, trailing / expected) + +

Bug @bug.bug_number_display@ - @bug.summary@ [@bug.component_name@]

+

State: @bug.pretty_state@

+

Found in version: @bug.found_in_version_name@

 +

Fix for version: @bug.fix_for_version_name@

 +

Fixed in version: @bug.fixed_in_version_name@

 + +

@roles.role_pretty@: @roles.user_name@

 + +@comments;noquote@ \ No newline at end of file Index: openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql 3 Jun 2004 23:36:52 -0000 1.7 +++ openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql 26 Jul 2004 13:10:25 -0000 1.8 @@ -10,7 +10,7 @@ b.bug_number, b.summary, b.component_id, - b.creation_date, + to_char(b.creation_date,'YYYY-MM-DD HH24:MI:SS') as creation_date, to_char(b.creation_date, 'fmMM/DDfm/YYYY') as creation_date_pretty, b.resolution, b.user_agent, @@ -164,7 +164,7 @@ b.comment_content, b.comment_format, b.component_id, - b.creation_date, + to_char(b.creation_date,'YYYY-MM-DD HH24:MI:SS') as creation_date, to_char(b.creation_date, 'fmMM/DDfm/YYYY') as creation_date_pretty, b.creation_user as submitter_user_id, submitter.first_names as submitter_first_names, Index: openacs-4/packages/bug-tracker/tcl/bug-search-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-search-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/bug-tracker/tcl/bug-search-procs.tcl 27 Apr 2004 12:33:21 -0000 1.1 +++ openacs-4/packages/bug-tracker/tcl/bug-search-procs.tcl 26 Jul 2004 13:10:25 -0000 1.2 @@ -21,26 +21,48 @@ @author Jeff Davis davis@xarg.net } { bug_tracker::bug::get -bug_id $bug_id -array row + set case_id [workflow::case::get_id \ -object_id $bug_id \ -workflow_short_name [bug_tracker::bug::workflow_short_name]] - set comments [workflow::case::get_activity_text -case_id $case_id] + + workflow::case::get -case_id $case_id -array case + + template::multirow -local create roles role_pretty email user_id user_name user_url + foreach role_id [workflow::get_roles -workflow_id $case(workflow_id)] { + workflow::role::get -role_id $role_id -array role + foreach assignee [workflow::case::role::get_assignees -case_id $case_id -role_id $role_id] { + array set ass $assignee + template::multirow -local append roles \ + $role(pretty_name) $ass(email) $ass(party_id) $ass(name) \ + "[ad_url][acs_community_member_url -user_id $ass(party_id)]" + array unset ass + } + array unset role + } + + set comments [workflow::case::get_activity_html -case_id $case_id] + set title "Bug $row(bug_number_display) - $row(summary) \[$row(component_name)\]" - set content [lang::util::localize "Bug $row(bug_number_display) - $row(summary) \[$row(component_name)\] -Created: $row(creation_date_pretty) -Fix for: $row(fix_for_version_name) -Fixed in: $row(fixed_in_version_name) $row(fixed_in_version) -Resolution: $row(resolution) -Found in: $row(found_in_version_name) -State: $row(pretty_state) -User agent: $row(user_agent)\n\n$comments"] + set base [apm_package_url_from_id $row(project_id)] + set full "[ad_url]$base" + set body [template::adp_include /packages/bug-tracker/lib/one-bug [list &bug "row" & roles base $full & comments style feed]] + return [list object_id $bug_id \ title $title \ - content $content \ + content $body \ keywords $row(component_name) \ storage_type text \ - mime text/plain ] + mime text/plain \ + syndication [list link "${full}bug?bug_number=$row(bug_number)" \ + description $title \ + author XXX \ + category bugs \ + guid "[ad_url]/o/$bug_id" \ + pubDate "2004-04-20 12:01:34" \ + ] \ + ] } ad_proc -private bug_tracker::search::bug::url { bug_id } { Index: openacs-4/packages/bug-tracker/www/bug.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.tcl,v diff -u -r1.34 -r1.35 --- openacs-4/packages/bug-tracker/www/bug.tcl 26 Jun 2004 12:49:47 -0000 1.34 +++ openacs-4/packages/bug-tracker/www/bug.tcl 26 Jul 2004 13:10:25 -0000 1.35 @@ -318,8 +318,8 @@ # check that the element exists if { [info exists bug:$element] && [info exists bug($element)] } { - if { [form is_request bug] \ - || [string equal [element get_property bug $element mode] display] } { + if {[form is_request bug] + || [string equal [element get_property bug $element mode] display] } { if { [string first "#" $bug($element)] == 0 } { element set_value bug $element [lang::util::localize $bug($element)] } else {