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 -N -r1.18 -r1.19 --- openacs-4/packages/bug-tracker/bug-tracker.info 26 Feb 2004 15:28:58 -0000 1.18 +++ openacs-4/packages/bug-tracker/bug-tracker.info 27 Mar 2004 13:15:28 -0000 1.19 @@ -7,7 +7,7 @@ f f - + postgresql oracle @@ -19,11 +19,11 @@ Bug tracking application with notifications, configurable state management, and patch upload. Contains the best of SDM, Bugzilla, FogBUGZ, and bughost.com. - - - - - + + + + + Index: openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql 30 Sep 2003 12:10:04 -0000 1.4 +++ openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql 27 Mar 2004 13:15:29 -0000 1.5 @@ -370,7 +370,8 @@ description => null, nls_language => null, mime_type => null, - data => null + data => null, + package_id => bt_bug.new.package_id ); -- create the item type row @@ -513,6 +514,9 @@ fixed_in_version = bt_bug_revision.new.fixed_in_version where bug_id = bt_bug_revision.new.bug_id; + -- update the title + update acs_objects set title = bt_bug.name(bt_bug_revision.new.bug_id) where object_id =bt_bug_revision.new.bug_id; + return v_revision_id; end new; 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 -N -r1.10 -r1.11 --- openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql 12 Mar 2004 19:19:47 -0000 1.10 +++ openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql 27 Mar 2004 13:15:29 -0000 1.11 @@ -346,7 +346,7 @@ null, 'f', null, - null + ''bt_bug__name'' ); @@ -461,7 +461,8 @@ null, -- description null, -- mime_type null, -- nls_language - null -- data + null, -- data + p_package_id ); -- create the item type row @@ -599,13 +600,32 @@ fixed_in_version = p_fixed_in_version where bug_id = p_bug_id; + -- update the title in acs_objects + update acs_objects set title = bt_bug__name(p_bug_id) where object_id = p_bug_id; + return v_revision_id; end; ' language 'plpgsql'; +create or replace function bt_bug__name( + integer -- bug_id +) returns varchar +as ' +declare + p_bug_id alias for $1; + v_name varchar; +begin + select ''Bug #''||bug_number||'': ''||summary + into v_name + from bt_bugs + where bug_id = p_bug_id; + return v_name; +end; +' language 'plpgsql'; + create table bt_user_prefs ( user_id integer not null constraint bt_user_prefs_user_id_fk @@ -729,7 +749,8 @@ p_creation_user, -- creation_user p_creation_ip, -- creation_ip p_project_id, -- context_id - ''t'' -- security_inherit_p + null, -- title + p_project_id -- package_id ); select coalesce(max(patch_number),0) + 1 @@ -754,6 +775,8 @@ p_generated_from_version, v_patch_number); + update acs_objects set title = bt_patch__name(v_patch_id) where object_id = v_patch_id; + select nextval(''t_acs_object_id_seq'') into v_action_id; @@ -774,7 +797,7 @@ p_patch_id alias for $1; v_name varchar; begin - select summary + select ''Patch #''||patch_number||'': ''||summary into v_name from bt_patches where patch_id = p_patch_id; Index: openacs-4/packages/bug-tracker/sql/postgresql/upgrade-1.4d1-1.4d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/sql/postgresql/upgrade-1.4d1-1.4d2.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/bug-tracker/sql/postgresql/upgrade-1.4d1-1.4d2.sql 27 Mar 2004 13:15:29 -0000 1.1 @@ -0,0 +1,266 @@ +update acs_object_types set name_method = 'bt_bug__name' where object_type = 'bt_bug' and name_method is null; + +create or replace function bt_bug__name( + integer -- bug_id +) returns varchar +as ' +declare + p_bug_id alias for $1; + v_name varchar; +begin + select ''Bug #''||bug_number||'': ''||summary + into v_name + from bt_bugs + where bug_id = p_bug_id; + + return v_name; +end; +' language 'plpgsql'; + +create or replace function bt_patch__new( + integer, -- patch_id + integer, -- project_id + integer, -- component_id + text, -- summary + text, -- description + text, -- description_format + text, -- content + integer, -- generated_from_version + integer, -- creation_user + varchar -- creation_ip +) returns int +as ' +declare + p_patch_id alias for $1; + p_project_id alias for $2; + p_component_id alias for $3; + p_summary alias for $4; + p_description alias for $5; + p_description_format alias for $6; + p_content alias for $7; + p_generated_from_version alias for $8; + p_creation_user alias for $9; + p_creation_ip alias for $10; + + v_patch_id integer; + v_patch_number integer; + v_action_id integer; +begin + + v_patch_id := acs_object__new( + p_patch_id, -- object_id + ''bt_patch'', -- object_type + current_timestamp, -- creation_date + p_creation_user, -- creation_user + p_creation_ip, -- creation_ip + p_project_id, -- context_id + null, -- title + p_project_id -- package_id + ); + + select coalesce(max(patch_number),0) + 1 + into v_patch_number + from bt_patches + where project_id = p_project_id; + + insert into bt_patches + (patch_id, + project_id, + component_id, + summary, + content, + generated_from_version, + patch_number) + values + (v_patch_id, + p_project_id, + p_component_id, + p_summary, + p_content, + p_generated_from_version, + v_patch_number); + + update acs_objects set title = bt_patch__name(v_patch_id) where object_id = v_patch_id; + + select nextval(''t_acs_object_id_seq'') + into v_action_id; + + insert into bt_patch_actions + (action_id, patch_id, action, actor, comment_text, comment_format) + values + (v_action_id, v_patch_id, ''open'', p_creation_user, p_description, p_description_format); + + return v_patch_id; +end; +' language 'plpgsql'; + + +create or replace function bt_bug_revision__new( + integer, -- bug_revision_id + integer, -- bug_id + integer, -- component_id + integer, -- found_in_version + integer, -- fix_for_version + integer, -- fixed_in_version + varchar, -- resolution + varchar, -- user_agent + varchar, -- summary + timestamptz, -- creation_date + integer, -- creation_user + varchar -- creation_ip +) returns int +as ' +declare + p_bug_revision_id alias for $1; + p_bug_id alias for $2; + p_component_id alias for $3; + p_found_in_version alias for $4; + p_fix_for_version alias for $5; + p_fixed_in_version alias for $6; + p_resolution alias for $7; + p_user_agent alias for $8; + p_summary alias for $9; + p_creation_date alias for $10; + p_creation_user alias for $11; + p_creation_ip alias for $12; + + v_revision_id integer; +begin + -- create the initial revision + v_revision_id := content_revision__new( + p_summary, -- title + null, -- description + current_timestamp, -- publish_date + null, -- mime_type + null, -- nls_language + null, -- new_data + p_bug_id, -- item_id + p_bug_revision_id, -- revision_id + p_creation_date, -- creation_date + p_creation_user, -- creation_user + p_creation_ip -- creation_ip + ); + + -- insert into the bug-specific revision table + insert into bt_bug_revisions + (bug_revision_id, component_id, resolution, user_agent, found_in_version, fix_for_version, fixed_in_version) + values + (v_revision_id, p_component_id, p_resolution, p_user_agent, p_found_in_version, p_fix_for_version, p_fixed_in_version); + + -- make this revision live + PERFORM content_item__set_live_revision(v_revision_id); + + -- update the cache + update bt_bugs + set live_revision_id = v_revision_id, + summary = p_summary, + component_id = p_component_id, + resolution = p_resolution, + user_agent = p_user_agent, + found_in_version = p_found_in_version, + fix_for_version = p_fix_for_version, + fixed_in_version = p_fixed_in_version + where bug_id = p_bug_id; + + -- update the title in acs_objects + update acs_objects set title = bt_bug__name(p_bug_id) where object_id = p_bug_id; + + return v_revision_id; +end; +' language 'plpgsql'; + + +create or replace function bt_patch__new( + integer, -- patch_id + integer, -- project_id + integer, -- component_id + text, -- summary + text, -- description + text, -- description_format + text, -- content + integer, -- generated_from_version + integer, -- creation_user + varchar -- creation_ip +) returns int +as ' +declare + p_patch_id alias for $1; + p_project_id alias for $2; + p_component_id alias for $3; + p_summary alias for $4; + p_description alias for $5; + p_description_format alias for $6; + p_content alias for $7; + p_generated_from_version alias for $8; + p_creation_user alias for $9; + p_creation_ip alias for $10; + + v_patch_id integer; + v_patch_number integer; + v_action_id integer; +begin + + v_patch_id := acs_object__new( + p_patch_id, -- object_id + ''bt_patch'', -- object_type + current_timestamp, -- creation_date + p_creation_user, -- creation_user + p_creation_ip, -- creation_ip + p_project_id, -- context_id + null, -- title + p_project_id -- package_id + ); + + select coalesce(max(patch_number),0) + 1 + into v_patch_number + from bt_patches + where project_id = p_project_id; + + insert into bt_patches + (patch_id, + project_id, + component_id, + summary, + content, + generated_from_version, + patch_number) + values + (v_patch_id, + p_project_id, + p_component_id, + p_summary, + p_content, + p_generated_from_version, + v_patch_number); + + update acs_objects set title = bt_patch__name(v_patch_id) where object_id = v_patch_id; + + select nextval(''t_acs_object_id_seq'') + into v_action_id; + + insert into bt_patch_actions + (action_id, patch_id, action, actor, comment_text, comment_format) + values + (v_action_id, v_patch_id, ''open'', p_creation_user, p_description, p_description_format); + + return v_patch_id; +end; +' language 'plpgsql'; + +create or replace function bt_patch__name( + integer -- patch_id +) returns varchar +as ' +declare + p_patch_id alias for $1; + v_name varchar; +begin + select ''Patch #''||patch_number||'': ''||summary + into v_name + from bt_patches + where patch_id = p_patch_id; + + return v_name; +end; +' language 'plpgsql'; + Index: openacs-4/packages/bug-tracker/www/patch.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/bug-tracker/www/patch.tcl 3 Oct 2003 16:58:22 -0000 1.7 +++ openacs-4/packages/bug-tracker/www/patch.tcl 27 Mar 2004 13:15:30 -0000 1.8 @@ -408,8 +408,11 @@ foreach column $edit_fields { set $column [element get_value patch $column] lappend update_exprs "$column = :$column" + if {[string equal $column summary]} { + set new_title "Patch \#$patch_number: $summary" + } } - + switch -- $mode { accept { set status "accepted" @@ -443,7 +446,9 @@ if { [llength $update_exprs] > 0 } { db_dml update_patch {} } - + if {[info exists new_title] && ![empty_string_p $new_title]} { + db_dml update_patch_title {update acs_objects set title = :new_title where object_id = :patch_id} + } set action_id [db_nextval "acs_object_id_seq"] foreach column { description desc_format } {