From: Victor B. <vb...@us...> - 2004-05-24 12:23:28
|
Update of /cvsroot/mantisbt/mantisbt/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv663/core Modified Files: bug_api.php csv_api.php Log Message: Enh #3164: Added "fixed in version" field, set when resolving a bug. M admin/upgrades/0_18_inc.php - Added fixed in release to bug table, and add an index on it. M core/bug_api.php - Support for "fixed in release" in the bug api M print_bug_page.php M bug_update.php M bug_update_advanced_page.php M bug_view_advanced_page.php - Added fixed in release. M bug_resolve.php M bug_resolve_page.php - Fixed in release is can also be set through the bug resolved page. M core/csv_api.php - Export the "fixed in release" M lang/strings_english.txt - Needed strings. Index: csv_api.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/core/csv_api.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- csv_api.php 8 Apr 2004 18:04:53 -0000 1.2 +++ csv_api.php 24 May 2004 12:23:18 -0000 1.3 @@ -74,7 +74,8 @@ 'summary' => 'summary', 'status' => 'status', 'resolution' => 'resolution', - 'duplicate_id' => 'duplicate_id' ); + 'duplicate_id' => 'duplicate_id', + 'fixed_in_version' => 'fixed_in_version' ); return $t_columns; } @@ -134,6 +135,12 @@ } # -------------------- + # return the fixed_in_version + function csv_format_fixed_in_version( $p_fixed_in_version ) { + return csv_escape_string( $p_fixed_in_version ); + } + + # -------------------- # return the projection function csv_format_projection( $p_projection ) { return csv_escape_string( get_enum_element( 'projection', $p_projection ) ); Index: bug_api.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/core/bug_api.php,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- bug_api.php 21 May 2004 21:42:51 -0000 1.60 +++ bug_api.php 24 May 2004 12:23:18 -0000 1.61 @@ -42,6 +42,7 @@ var $os_build = ''; var $platform = ''; var $version = ''; + var $fixed_in_version = ''; var $build = ''; var $view_state = VS_PUBLIC; var $summary = ''; @@ -503,6 +504,7 @@ platform='$c_bug_data->platform', version='$c_bug_data->version', build='$c_bug_data->build', + fixed_in_version='$c_bug_data->fixed_in_version', view_state='$c_bug_data->view_state', summary='$c_bug_data->summary', sponsorship_total='$c_bug_data->sponsorship_total' @@ -529,6 +531,7 @@ history_log_event_direct( $p_bug_id, 'platform', $t_old_data->platform, $p_bug_data->platform ); history_log_event_direct( $p_bug_id, 'version', $t_old_data->version, $p_bug_data->version ); history_log_event_direct( $p_bug_id, 'build', $t_old_data->build, $p_bug_data->build ); + history_log_event_direct( $p_bug_id, 'fixed_in_version', $t_old_data->fixed_in_version, $p_bug_data->fixed_in_version ); history_log_event_direct( $p_bug_id, 'view_state', $t_old_data->view_state, $p_bug_data->view_state ); history_log_event_direct( $p_bug_id, 'summary', $t_old_data->summary, $p_bug_data->summary ); history_log_event_direct( $p_bug_id, 'sponsorship_total', $t_old_data->sponsorship_total, $p_bug_data->sponsorship_total ); @@ -841,10 +844,11 @@ # -------------------- # resolve the given bug - function bug_resolve( $p_bug_id, $p_resolution, $p_bugnote_text = '', $p_duplicate_id = null, $p_handler_id = null ) { + function bug_resolve( $p_bug_id, $p_resolution, $p_fixed_in_version, $p_bugnote_text = '', $p_duplicate_id = null, $p_handler_id = null ) { $p_bugnote_text = trim( $p_bugnote_text ); bug_set_field( $p_bug_id, 'status', config_get( 'bug_readonly_status_threshold' ) ); + bug_set_field( $p_bug_id, 'fixed_in_version', $p_fixed_in_version ); bug_set_field( $p_bug_id, 'resolution', (int)$p_resolution ); if ( null !== $p_duplicate_id ) { @@ -992,6 +996,7 @@ $p_bug_data->platform = db_prepare_string( $p_bug_data->platform ); $p_bug_data->version = db_prepare_string( $p_bug_data->version ); $p_bug_data->build = db_prepare_string( $p_bug_data->build ); + $p_bug_data->fixed_in_version = db_prepare_string( $p_bug_data->fixed_in_version ); $p_bug_data->view_state = db_prepare_int( $p_bug_data->view_state ); $p_bug_data->summary = db_prepare_string( $p_bug_data->summary ); $p_bug_data->sponsorship_total = db_prepare_int( $p_bug_data->sponsorship_total ); @@ -1015,6 +1020,7 @@ $p_bug_data->platform = string_attribute( $p_bug_data->platform ); $p_bug_data->version = string_attribute( $p_bug_data->version ); $p_bug_data->build = string_attribute( $p_bug_data->build ); + $p_bug_data->fixed_in_version = string_attribute( $p_bug_data->fixed_in_version ); $p_bug_data->summary = string_attribute( $p_bug_data->summary ); $p_bug_data->sponsorship_total = string_attribute( $p_bug_data->sponsorship_total ); @@ -1037,6 +1043,7 @@ $p_bug_data->platform = string_display( $p_bug_data->platform ); $p_bug_data->version = string_display( $p_bug_data->version ); $p_bug_data->build = string_display( $p_bug_data->build ); + $p_bug_data->fixed_in_version = string_display( $p_bug_data->fixed_in_version ); $p_bug_data->summary = string_display_links( $p_bug_data->summary ); $p_bug_data->sponsorship_total = string_display( $p_bug_data->sponsorship_total ); |