Index: openacs-4/packages/bug-tracker/bug-tracker.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/bug-tracker.info,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/bug-tracker.info	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/bug-tracker.info	29 Aug 2002 09:41:53 -0000	1.2
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.7d2" url="http://openacs.org/repository/download/apm/bug-tracker-0.7d2.apm">
+    <version name="0.7d3" url="http://openacs.org/repository/download/apm/bug-tracker-0.7d3.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:lars@collaboraid.net">Lars Pind</owner>
+        <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
         <summary>Tracks bugs and features, versions and maintainers, in software projects. Contains the best of SDM, Bugzilla, FogBUGZ, and bughost.com.</summary>
-        <release-date>2002-05-03</release-date>
+        <release-date>2002-08-29</release-date>
         <vendor url="http://www.museatech.net">Musea Technologies</vendor>
 
         <!-- No dependency information -->
@@ -34,6 +34,7 @@
             <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/bug-tracker-drop.sql"/>
             <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade-0.5d1-0.7d1.sql"/>
             <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade-0.7d1-0.7d2.sql"/>
+            <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade-0.7d2-0.7d3.sql"/>
             <file type="tcl_procs" path="tcl/bug-tracker-procs.tcl"/>
             <file path="todo.txt"/>
             <file type="content_page" path="www/admin/component-ae.adp"/>
Index: openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql	29 Aug 2002 09:41:53 -0000	1.2
@@ -314,6 +314,10 @@
   action                        varchar(50)
                                 constraint bt_bug_actions_action_ck
                                 check (action in ('open','edit','comment','reassign','resolve','reopen','close')),
+  resolution                    varchar(50)
+                                constraint bt_bugs_actions_resolution_ck
+                                check (resolution is null or 
+                                       resolution in ('fixed','bydesign','wontfix','postponed','duplicate','norepro')),
   actor                         integer not null
                                 constraint bt_bug_actions_actor_fk
                                 references users(user_id),
Index: openacs-4/packages/bug-tracker/sql/postgresql/upgrade-0.7d2-0.7d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/sql/postgresql/upgrade-0.7d2-0.7d3.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bug-tracker/sql/postgresql/upgrade-0.7d2-0.7d3.sql	29 Aug 2002 09:41:53 -0000	1.1
@@ -0,0 +1,8 @@
+
+-- Added resolution code to bt_bug_actions
+
+alter table bt_bug_actions add column
+  resolution                    varchar(50)
+                                constraint bt_bugs_resolution_ck
+                                check (resolution is null or 
+                                       resolution in ('fixed','bydesign','wontfix','postponed','duplicate','norepro'));
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	28 Aug 2002 15:44:18 -0000	1.3
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	29 Aug 2002 09:41:54 -0000	1.4
@@ -443,6 +443,7 @@
     
     ad_proc bug_action_pretty {
         action
+        {resolution ""}
     } {
         array set action_codes {
             open "Opened"
@@ -454,7 +455,8 @@
             close "Closed"
         }
         if { [info exists action_codes($action)] } {
-            return $action_codes($action)
+            set resolution_pretty [resolution_pretty $resolution]
+            return "$action_codes($action) [ad_decode $resolution_pretty "" "" " ($resolution_pretty)"]"
         } else {
             return ""
         }
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.5 -r1.6
--- openacs-4/packages/bug-tracker/www/bug.tcl	29 Aug 2002 09:19:38 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/bug.tcl	29 Aug 2002 09:41:55 -0000	1.6
@@ -336,6 +336,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,
@@ -350,7 +351,7 @@
         and    actor.user_id = ba.actor
         order  by action_date
     } {
-        append action_html "<b>$action_date_pretty [bug_tracker::bug_action_pretty $action] by $actor_first_names $actor_last_name</b>
+        append action_html "<b>$action_date_pretty [bug_tracker::bug_action_pretty $action $resolution] by $actor_first_names $actor_last_name</b>
         <blockquote>[bug_tracker::bug_convert_comment_to_html -comment $comment -format $comment_format]</blockquote>"
     }
 
@@ -471,11 +472,15 @@
             set $column [element get_value bug $column]
         }
 
+        if { ![info exists resolution] } {
+            set resolution {}
+        }
+
         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)
         }
     }