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.24 -r1.25
--- openacs-4/packages/bug-tracker/bug-tracker.info	29 May 2008 14:59:43 -0000	1.24
+++ openacs-4/packages/bug-tracker/bug-tracker.info	29 May 2008 15:09:52 -0000	1.25
@@ -1,3 +1,4 @@
+
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
@@ -12,7 +13,7 @@
         <summary>Tracks bugs and features, versions and maintainers, in software projects.</summary>
         <release-date>2008-05-13</release-date>
         <vendor url="http://www.museatech.net">Musea Technologies</vendor>
-        <description format="text/html">Bug tracking application with notifications, configurable state management, and patch upload.
+        <description format="text/html">Bug tracking application with notifications, configurable state management, and patch upload.
         Contains the best of SDM, Bugzilla, FogBUGZ, and bughost.com.</description>
         <maturity>0</maturity>
 
@@ -36,6 +37,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ComponentPrettyPlural"  default="components" description="Plural pretty name of a component/area/module, e.g. 'area'. Use the capitalization that you would use in the middle of a sentence."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailPostID"  description="Used by the callback to acs_mail_lite::incoming_email in parsing the reply address to know what bug-tracker instance to insert a bug. For example, if this is set to ABC then emails to tt-ABC@yourserver.com will be posted on this instance.  The tt- portion is a catch all email you configure for your domain.  It's up to the user to properly configure fetchmail or any other software that will be able to fetch the mails from a POP server.  acs-mail-lite should also be configured to scan the incoming mail queue."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="PatchesP"  default="1" description="Enable patch submissions for this project"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="RelatedFilesP"  default="0" description="Enable related files submissions for this project"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TicketPrettyName"  default="bug" description="Pretty name of a ticket, e.g. 'ticket'. Use the capitalization that you would use in the middle of a sentence."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TicketPrettyPlural"  default="bugs" description="Plural pretty name of a ticket , e.g. 'tickets'. Use the capitalization that you would use in the middle of a sentence."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="TimeToLive"  default="0" description="Use this parameter to specify the time (number of days) to live of the bugs. If a bug is not modified before the number of days specified by this parameter, it will be automatically closed. This will work only for the instance of the bug tracker specified by the BugTrackerInsance parameter in the acs-kernel package.  Leave this parameter in 0 (zero) if you do not want to automatically close any bug."/>
Index: openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml	29 May 2008 15:01:08 -0000	1.9
+++ openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml	29 May 2008 15:09:52 -0000	1.10
@@ -70,6 +70,8 @@
   <msg key="Component_id_not_found">Component_id %component_id% not found</msg>
   <msg key="components">components</msg>
   <msg key="Components_component_filter">Components: %component_filter%</msg>
+  <msg key="Confirm_delete_related_file">Confirm delete</msg>
+  <msg key="Confirm_delete_related_file_text">Are you sure you want to delete this related file from this bug? You will not be able to undo this action.</msg>
   <msg key="Create_new">Create new</msg>
   <msg key="Create_new_category_type">Create new category type</msg>
   <msg key="Creation_Date">Creation Date</msg>
@@ -79,9 +81,12 @@
   <msg key="Custom">Custom</msg>
   <msg key="Default">Default</msg>
   <msg key="Delete">Delete</msg>
+  <msg key="delete">delete</msg>
+  <msg key="Delete_related_file">Delete related file</msg>
   <msg key="Deleted">Deleted</msg>
   <msg key="Description">Description</msg>
   <msg key="Description_1">format</msg>
+  <msg key="download">download</msg>
   <msg key="Download_patch_content">Download patch content</msg>
   <msg key="Duplicate">Duplicate</msg>
   <msg key="Edit">Edit</msg>
@@ -140,6 +145,7 @@
   <msg key="No_of_All">%next_bug_num% of %all_bugs%</msg>
   <msg key="No_patches">No %patches_name%.</msg>
   <msg key="No_Permission_to_do_action">You don't have permission to '%action.pretty_name%' on bug #%bug_id% &quot;%bug.summary%&quot;</msg>
+  <msg key="No_related_files">No related files</msg>
   <msg key="No_selected_bugs">No selected bugs.</msg>
   <msg key="No_user_in_database">Couldn't find user in database</msg>
   <msg key="None">None</msg>
@@ -182,10 +188,21 @@
   <msg key="Priority_codes">Priority codes</msg>
   <msg key="Project">Name</msg>
   <msg key="Project_administration">Project administration</msg>
+  <msg key="properties">properties</msg>
   <msg key="Reassign">Reassign</msg>
   <msg key="Reassigned">Reassigned</msg>
   <msg key="Refuse">Refuse</msg>
   <msg key="Refused">Refused</msg>
+  <msg key="related_file_delete_comment">A related file (%filename%) was deleted from this %bug_pretty%.</msg>
+  <msg key="Related_File_Description">Description</msg>
+  <msg key="Related_File_File">File</msg>
+  <msg key="Related_File_File_required">File is required</msg>
+  <msg key="Related_file_filename">Filename</msg>
+  <msg key="related_file_new_comment">A file (%filename%) was uploaded to this %bug_pretty%. &lt;br&gt;&lt;br&gt; Description:&lt;br&gt; %description%</msg>
+  <msg key="Related_file_not_found">Related file not found</msg>
+  <msg key="Related_file_properties">Related File Properties</msg>
+  <msg key="related_file_update_comment">A new revision (%filename%) for a file (%old_filename%) was uploaded to this %bug_pretty%. &lt;br&gt;&lt;br&gt; Description:&lt;br&gt; %description%</msg>
+  <msg key="Related_Files">Related Files</msg>
   <msg key="Release">Release</msg>
   <msg key="Release_1">Version</msg>
   <msg key="Release_this_version">Release this version</msg>
@@ -263,7 +280,10 @@
   <msg key="Unsubscribe">Unsubscribe</msg>
   <msg key="Unsubscribe_1">from %pretty_name%&quot; &quot;&lt;# Subscribe to %pretty_name%</msg>
   <msg key="unsubscribe_to_bug">Unsubscribe to notifications for activity on this %bug_name%</msg>
+  <msg key="Update_related_file">Upload new revision of related file (%filename%)</msg>
+  <msg key="upload_new_version">upload new version</msg>
   <msg key="Upload_Patch">Upload a patch</msg>
+  <msg key="Upload_related_file">Upload related file</msg>
   <msg key="Use_default_setup">Use default setup</msg>
   <msg key="User_Agent">User Agent</msg>
   <msg key="Version">Version</msg>
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.35 -r1.36
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	29 May 2008 14:59:43 -0000	1.35
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	29 May 2008 15:09:52 -0000	1.36
@@ -1296,6 +1296,8 @@
 	if [db_0or1row instance_info { *SQL* } ] {
 	    set folder_id [content::folder::new -name "bug_tracker_$project_id" -package_id $project_id]
 	    content::folder::register_content_type -folder_id $folder_id -content_type {bt_bug_revision} -include_subtypes t
+	    content::folder::register_content_type -folder_id $folder_id -content_type "content_revision"
+	    content::folder::register_content_type -folder_id $folder_id -content_type "image"
 	    
 	    set keyword_id [content::keyword::new -heading "$instance_name"]
 	    
@@ -1378,3 +1380,49 @@
                              -package_id $package_id \
                              -workflow_id $workflow_id]]
 }
+
+#####
+#
+# Related Files
+#
+#####
+
+ad_proc bug_tracker::related_files_p {} { 
+    Is the related files submission feature turned on?
+} {
+    return [parameter::get -package_id [ad_conn package_id] -parameter "RelatedFilesP" -default 1]
+}
+
+ad_proc bug_tracker::get_related_files_links {
+    {-bug_id:required}
+} {
+    set related_files_list [list]
+    set user_id [ad_conn user_id]
+    set admin_p [permission::permission_p \
+                     -party_id $user_id \
+                     -object_id [ad_conn package_id] \
+                     -privilege "admin"]
+    set return_url [ad_return_url]
+
+    db_foreach get_related_files_for_bug {} {
+        set view_url [export_vars -base related-file-download {bug_id related_object_id {t $related_revision_id}}]
+        set properties_url [export_vars -base "related-file-properties" {bug_id related_object_id}]
+        set delete_url [export_vars -base "related-file-delete" {bug_id related_object_id return_url}]
+        set new_version_url [export_vars -base "related-file-update" {bug_id related_object_id return_url}]
+        if { ( $related_creation_user == $user_id ) || $admin_p } {
+            set extra_actions " | <a href=\"$new_version_url\">[_ bug-tracker.upload_new_version]</a> | <a href=\"$delete_url\">[_ bug-tracker.delete]</a>"
+        } else {
+            set extra_actions ""
+        }
+        lappend related_files_list "$related_title <a href=\"${view_url}\">[_ bug-tracker.download]</a> | <a href=\"${properties_url}\">[_ bug-tracker.properties]</a>${extra_actions}"
+    } if_no_rows { 
+        set related_files_string [_ bug-tracker.No_related_files]
+    }
+    
+    if { [llength $related_files_list] != 0 } {
+        set related_files_string [join $related_files_list "<br>"]
+    }
+    
+    return $related_files_string
+}
+
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql	25 Feb 2005 17:08:11 -0000	1.6
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql	29 May 2008 15:09:52 -0000	1.7
@@ -221,6 +221,25 @@
     </querytext>
   </fullquery>
 
-
+  <fullquery name="bug_tracker::get_related_files_links.get_related_files_for_bug">      
+    <querytext>
+      select l.rel_id,
+             l.object_id_two as related_object_id,
+             r.title as related_title,
+             i.name as related_name,
+             o.creation_user as related_creation_user,
+             r.revision_id as related_revision_id
+        from acs_data_links l,
+             cr_items i,
+             cr_revisions r,
+             acs_objects o
+       where l.object_id_one = :bug_id
+             and l.object_id_two = i.item_id
+             and r.revision_id = i.live_revision
+             and i.item_id = o.object_id
+             and (i.content_type = 'content_revision' or i.content_type = 'image')
+       order by l.object_id_two
+    </querytext>
+  </fullquery>
  
 </queryset>
Index: openacs-4/packages/bug-tracker/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/install-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bug-tracker/tcl/install-procs.tcl	13 Jan 2005 13:56:16 -0000	1.4
+++ openacs-4/packages/bug-tracker/tcl/install-procs.tcl	29 May 2008 15:09:52 -0000	1.5
@@ -65,6 +65,12 @@
                     workflow::case::state_changed_handler -case_id $case_id
                 }
             }
+            1.4d3 1.4d4 { 
+                db_foreach select_folder_ids {} {
+                    content::folder::register_content_type -folder_id $folder_id -content_type "content_revision"
+                    content::folder::register_content_type -folder_id $folder_id -content_type "image"
+                }
+            }
         }
 }
 
Index: openacs-4/packages/bug-tracker/tcl/install-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/install-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/tcl/install-procs.xql	13 Jan 2005 13:56:16 -0000	1.2
+++ openacs-4/packages/bug-tracker/tcl/install-procs.xql	29 May 2008 15:09:52 -0000	1.3
@@ -16,4 +16,11 @@
     </querytext>
 </fullquery>
 
+<fullquery name="bug_tracker::install::package_upgrade.select_folder_ids">
+    <querytext>
+      select folder_id
+      from bt_projects
+    </querytext>
+</fullquery>
+
 </queryset>
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.38 -r1.39
--- openacs-4/packages/bug-tracker/www/bug.tcl	1 Mar 2005 00:01:26 -0000	1.38
+++ openacs-4/packages/bug-tracker/www/bug.tcl	29 May 2008 15:09:52 -0000	1.39
@@ -39,6 +39,8 @@
 # Paches enabled for this project?
 set patches_p [bug_tracker::patches_p]
 
+# Does project allow upload of related files?
+set related_files_p [bug_tracker::related_files_p]
 
 #####
 #
@@ -186,6 +188,10 @@
 # More fixed form elements
 
 ad_form -extend -name bug -form {
+    {related_files:text(inform)
+	{label "[_ bug-tracker.Related_Files]"}
+	{mode display}
+    }
     {patches:text(inform)
 	{label $patch_label}
 	{mode display}
@@ -300,6 +306,9 @@
     # Display value for patches
     set bug(patches_display) "[bug_tracker::get_patch_links -bug_id $bug(bug_id) -show_patch_status $show_patch_status] &nbsp; \[ <a href=\"patch-add?[export_vars { { bug_number $bug(bug_number) } { component_id $bug(component_id) } }]\">[_ bug-tracker.Upload_Patch]</a> \]"
 
+    # Display value for related files
+    set bug(related_files_display) "[bug_tracker::get_related_files_links -bug_id $bug(bug_id)]<br>\[ <a href=\"related-file-add?[export_vars { { bug_number $bug(bug_number) } return_url }]\">[_ bug-tracker.Upload_related_file]</a> \]"
+
     # Hide elements that should be hidden depending on the bug status
     foreach element $bug(hide_fields) {
         element set_properties bug $element -widget hidden
@@ -321,6 +330,14 @@
         }
     }
 
+    if { !$related_files_p } {
+        foreach element { related_files } {
+            if { [info exists bug:$element] } {
+                element set_properties bug $element -widget hidden
+            }
+        }
+    }
+
     # Optionally hide user agent
     if { !$user_agent_p } {
         element set_properties bug user_agent -widget hidden
@@ -357,6 +374,7 @@
     # Set values for elements with separate display value
     foreach element { 
         patches
+        related_files
     } {
         # check that the element exists
         if { [info exists bug:$element] } {