Menu
▾
▴
[Mantisbt-cvs] mantisbt bug_report_advanced_page.php,1.36,1.37 bug_report_page.php,1.38,1.39 bug_resolve_page.php,1.39,1.40 bug_update_advanced_page.php,1.69,1.70 bug_update_page.php,1.70,1.71 changelog_page.php,1.5,1.6 manage_proj_edit_page.php,1.77,1.78 manage_proj_ver_delete.php,1.20,1.21 manage_proj_ver_edit_page.php,1.26,1.27 manage_proj_ver_update.php,1.28,1.29 view_filters_page.php,1.11,1.12
|
From: Victor B. <vb...@us...> - 2004-07-11 07:10:02
|
Update of /cvsroot/mantisbt/mantisbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17582 Modified Files: bug_report_advanced_page.php bug_report_page.php bug_resolve_page.php bug_update_advanced_page.php bug_update_page.php changelog_page.php manage_proj_edit_page.php manage_proj_ver_delete.php manage_proj_ver_edit_page.php manage_proj_ver_update.php view_filters_page.php Log Message: Enh #4066: Support "future" versions and a description field (vboctor) - Added id as a primary key to mantis_version_table (however, this will not be used to refer to versions). - Support "released" flag, this will determine whether a version is a released version or a future version. Product version field will only show released versions, but "fixed in version" will show all. - Added description field, and show it in Changelog before the actual list of entries. - Use version id in the edit/delete version pages to refer to a specific version. - Use version id in the version_api to refer to a specific version. - Use a version information class in version_api. - Support caching in versions_api. Index: bug_resolve_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_resolve_page.php,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- bug_resolve_page.php 26 Jun 2004 14:05:42 -0000 1.39 +++ bug_resolve_page.php 11 Jul 2004 07:09:51 -0000 1.40 @@ -117,7 +117,7 @@ <td> <select name="fixed_in_version"> <?php print_version_option_list( bug_get_field( $f_bug_id, 'fixed_in_version' ), - bug_get_field( $f_bug_id, 'project_id' ) ) ?> + bug_get_field( $f_bug_id, 'project_id' ), VERSION_ALL ) ?> </select> </td> </tr> Index: changelog_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/changelog_page.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- changelog_page.php 10 Jul 2004 12:09:46 -0000 1.5 +++ changelog_page.php 11 Jul 2004 07:09:52 -0000 1.6 @@ -44,6 +44,8 @@ $t_version = $t_version_row['version']; $c_version = db_prepare_string( $t_version ); + $t_version_id = version_get_id( $c_version ); + $query = "SELECT id, view_state FROM $t_bug_table WHERE project_id='$c_project_id' AND fixed_in_version='$c_version' ORDER BY last_updated DESC"; $t_first_entry = true; @@ -60,6 +62,7 @@ continue; } + # Print the header for the version with the first changelog entry to be added. if ( $t_first_entry ) { if ( $i > 0 ) { echo '<br />'; @@ -69,10 +72,14 @@ echo $t_release_title, '<br />'; echo str_pad( '', strlen( $t_release_title ), '=' ), '<br />'; + $t_description = version_get_field( $t_version_id, 'description' ); + if ( ( $t_description !== false ) && !is_blank( $t_description ) ) { + echo string_display( "<br />$t_description<br /><br />" ); + } + $t_first_entry = false; } - helper_call_custom_function( 'changelog_print_issue', array( $t_issue_id ) ); } Index: bug_report_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_report_page.php,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- bug_report_page.php 26 Jun 2004 14:05:42 -0000 1.38 +++ bug_report_page.php 11 Jul 2004 07:09:51 -0000 1.39 @@ -139,7 +139,7 @@ </td> <td> <select tabindex="9" name="product_version"> - <?php print_version_option_list( $f_product_version ) ?> + <?php print_version_option_list( $f_product_version, $t_project_id, VERSION_RELEASED ) ?> </select> </td> </tr> Index: manage_proj_edit_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_edit_page.php,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- manage_proj_edit_page.php 27 May 2004 23:53:10 -0000 1.77 +++ manage_proj_edit_page.php 11 Jul 2004 07:09:52 -0000 1.78 @@ -283,10 +283,11 @@ <?php $t_name = urlencode( $t_name ); $t_date_order = urlencode( $t_date_order ); + $t_version_id = version_get_id( $t_name, $f_project_id ); - print_bracket_link( 'manage_proj_ver_edit_page.php?project_id=' . $f_project_id . '&version=' . $t_name . '&date_order=' . $t_date_order, lang_get( 'edit_link' ) ); + print_bracket_link( 'manage_proj_ver_edit_page.php?version_id=' . $t_version_id, lang_get( 'edit_link' ) ); echo ' '; - print_bracket_link( 'manage_proj_ver_delete.php?project_id=' . $f_project_id . '&version=' . $t_name . '&date_order=' . $t_date_order, lang_get( 'delete_link' ) ); + print_bracket_link( 'manage_proj_ver_delete.php?version_id=' . $t_version_id, lang_get( 'delete_link' ) ); ?> </td> </tr> Index: manage_proj_ver_delete.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_ver_delete.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- manage_proj_ver_delete.php 11 Jan 2004 07:16:07 -0000 1.20 +++ manage_proj_ver_delete.php 11 Jul 2004 07:09:52 -0000 1.21 @@ -17,15 +17,16 @@ require_once( $t_core_path.'version_api.php' ); ?> <?php - $f_project_id = gpc_get_int( 'project_id' ); - $f_version = gpc_get_string( 'version' ); + $f_version_id = gpc_get_int( 'version_id' ); - access_ensure_project_level( config_get( 'manage_project_threshold' ), $f_project_id ); + $t_version_info = version_get( $f_version_id ); + + access_ensure_project_level( config_get( 'manage_project_threshold' ), $t_version_info->project_id ); helper_ensure_confirmed( lang_get( 'version_delete_sure' ), lang_get( 'delete_version_button' ) ); - version_remove( $f_project_id, $f_version ); + version_remove( $f_version_id ); - print_header_redirect( 'manage_proj_edit_page.php?project_id=' . $f_project_id ); + print_header_redirect( 'manage_proj_edit_page.php?project_id=' . $t_version_info->project_id ); ?> Index: bug_report_advanced_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_report_advanced_page.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- bug_report_advanced_page.php 26 Jun 2004 14:05:42 -0000 1.36 +++ bug_report_advanced_page.php 11 Jul 2004 07:09:51 -0000 1.37 @@ -205,7 +205,7 @@ </td> <td> <select tabindex="9" name="product_version"> - <?php print_version_option_list( $f_product_version ) ?> + <?php print_version_option_list( $f_product_version, $t_project_id, VERSION_RELEASED ) ?> </select> </td> </tr> Index: manage_proj_ver_update.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_ver_update.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- manage_proj_ver_update.php 11 Jan 2004 07:16:07 -0000 1.28 +++ manage_proj_ver_update.php 11 Jul 2004 07:09:52 -0000 1.29 @@ -17,23 +17,31 @@ require_once( $t_core_path.'version_api.php' ); ?> <?php - $f_project_id = gpc_get_int( 'project_id' ); - $f_version = gpc_get_string( 'version' ); + $f_version_id = gpc_get_int( 'version_id' ); + + $t_version = version_get( $f_version_id ); + $f_date_order = gpc_get_string( 'date_order' ); $f_new_version = gpc_get_string( 'new_version' ); + $f_description = gpc_get_string( 'description' ); + $f_released = gpc_get_bool( 'released' ); - access_ensure_project_level( config_get( 'manage_project_threshold' ), $f_project_id ); + access_ensure_project_level( config_get( 'manage_project_threshold' ), $t_version->project_id ); if ( is_blank( $f_new_version ) ) { trigger_error( ERROR_EMPTY_FIELD, ERROR ); } - $f_version = trim( $f_version ); $f_new_version = trim( $f_new_version ); - version_update( $f_project_id, $f_version, $f_new_version, $f_date_order ); + $t_version->version = $f_new_version; + $t_version->description = $f_description; + $t_version->released = $f_released ? VERSION_RELEASED : VERSION_FUTURE; + $t_version->date_order = $f_date_order; - $t_redirect_url = 'manage_proj_edit_page.php?project_id=' . $f_project_id; + version_update( $t_version ); + + $t_redirect_url = 'manage_proj_edit_page.php?project_id=' . $t_version->project_id; ?> <?php html_page_top1(); @@ -52,4 +60,4 @@ ?> </div> -<?php html_page_bottom1( __FILE__ ) ?> +<?php html_page_bottom1( __FILE__ ) ?> \ No newline at end of file Index: manage_proj_ver_edit_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_ver_edit_page.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- manage_proj_ver_edit_page.php 12 Apr 2004 21:04:35 -0000 1.26 +++ manage_proj_ver_edit_page.php 11 Jul 2004 07:09:52 -0000 1.27 @@ -11,11 +11,11 @@ ?> <?php require_once( 'core.php' ) ?> <?php - $f_project_id = gpc_get_int( 'project_id' ); - $f_version = gpc_get_string( 'version' ); - $f_date_order = gpc_get_string( 'date_order' ); + $f_version_id = gpc_get_int( 'version_id' ); - access_ensure_project_level( config_get( 'manage_project_threshold' ), $f_project_id ); + $t_version = version_get( $f_version_id ); + + access_ensure_project_level( config_get( 'manage_project_threshold' ), $t_version->project_id ); ?> <?php html_page_top1() ?> <?php html_page_top2() ?> @@ -25,8 +25,7 @@ <br /> <div align="center"> <form method="post" action="manage_proj_ver_update.php"> -<input type="hidden" name="project_id" value="<?php echo string_attribute( $f_project_id ) ?>" /> -<input type="hidden" name="version" value="<?php echo string_attribute( $f_version ) ?>" /> +<input type="hidden" name="version_id" value="<?php echo string_attribute( $t_version->id ) ?>" /> <table class="width50" cellspacing="1"> <tr> <td class="form-title" colspan="2"> @@ -38,7 +37,7 @@ <?php echo lang_get( 'version' ) ?> </td> <td> - <input type="text" name="new_version" size="32" maxlength="64" value="<?php echo string_attribute( $f_version ) ?>" /> + <input type="text" name="new_version" size="32" maxlength="64" value="<?php echo string_attribute( $t_version->version ) ?>" /> </td> </tr> <tr <?php helper_alternate_class() ?>> @@ -46,7 +45,23 @@ <?php echo lang_get( 'date_order' ) ?> </td> <td> - <input type="text" name="date_order" size="32" value="<?php echo string_attribute( $f_date_order ) ?>" /> + <input type="text" name="date_order" size="32" value="<?php echo string_attribute( $t_version->date_order ) ?>" /> + </td> +</tr> +<tr <?php helper_alternate_class() ?>> + <td class="category"> + <?php echo lang_get( 'description' ) ?> + </td> + <td> + <textarea name="description" cols="60" rows="5" wrap="virtual"><?php echo string_attribute( $t_version->description ) ?></textarea> + </td> +</tr> +<tr <?php helper_alternate_class() ?>> + <td class="category"> + <?php echo lang_get( 'released' ) ?> + </td> + <td> + <input type="checkbox" name="released" <?php check_checked( $t_version->released, VERSION_RELEASED ); ?> /> </td> </tr> <tr> @@ -65,10 +80,9 @@ <div class="border-center"> <form method="post" action="manage_proj_ver_delete.php"> - <input type="hidden" name="project_id" value="<?php echo string_attribute( $f_project_id ) ?>" /> - <input type="hidden" name="version" value="<?php echo string_attribute( $f_version ) ?>" /> + <input type="hidden" name="version_id" value="<?php echo string_attribute( $t_version->id ) ?>" /> <input type="submit" class="button" value="<?php echo lang_get( 'delete_version_button' ) ?>" /> </form> </div> -<?php html_page_bottom1( __FILE__ ) ?> +<?php html_page_bottom1( __FILE__ ) ?> \ No newline at end of file Index: view_filters_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/view_filters_page.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- view_filters_page.php 9 Jul 2004 00:02:02 -0000 1.11 +++ view_filters_page.php 11 Jul 2004 07:09:52 -0000 1.12 @@ -307,7 +307,7 @@ <select <?php PRINT $t_select_modifier;?> name="show_version[]"> <option value="any"><?php echo lang_get( 'any' ) ?></option> <option value="any"></option> - <?php print_version_option_list( $t_filter['show_version'] ) ?> + <?php print_version_option_list( $t_filter['show_version'], null, VERSION_RELEASED ) ?> </select> </td> <!-- Fixed in Version --> @@ -315,7 +315,7 @@ <select <?php PRINT $t_select_modifier;?> name="fixed_in_version[]"> <option value="any"><?php echo lang_get( 'any' ) ?></option> <option value="any"></option> - <?php print_version_option_list( $t_filter['fixed_in_version'] ) ?> + <?php print_version_option_list( $t_filter['fixed_in_version'], null, VERSION_ALL ) ?> </select> </td> <!-- Number of bugs per page --> Index: bug_update_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_update_page.php,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- bug_update_page.php 26 Jun 2004 14:05:42 -0000 1.70 +++ bug_update_page.php 11 Jul 2004 07:09:51 -0000 1.71 @@ -244,7 +244,7 @@ </td> <td colspan="5"> <select name="version"> - <?php print_version_option_list( $t_bug->version, $t_bug->project_id ) ?> + <?php print_version_option_list( $t_bug->version, $t_bug->project_id, VERSION_RELEASED ) ?> </select> </td> </tr> Index: bug_update_advanced_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_update_advanced_page.php,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- bug_update_advanced_page.php 26 Jun 2004 14:05:42 -0000 1.69 +++ bug_update_advanced_page.php 11 Jul 2004 07:09:51 -0000 1.70 @@ -287,7 +287,7 @@ </td> <td> <select name="fixed_in_version"> - <?php print_version_option_list( $t_bug->fixed_in_version, $t_bug->project_id ) ?> + <?php print_version_option_list( $t_bug->fixed_in_version, $t_bug->project_id, VERSION_ALL ) ?> </select> </td> @@ -297,7 +297,7 @@ </td> <td> <select name="version"> - <?php print_version_option_list( $t_bug->version, $t_bug->project_id ) ?> + <?php print_version_option_list( $t_bug->version, $t_bug->project_id, VERSION_RELEASED ) ?> </select> </td> |