0012669: Ordering of version fields in filter area is not ideal - MantisBT

ID	Project	Category	View Status	Date Submitted	Last Update
0012669	mantisbt	filters	public	2011-01-08 18:35	2011-04-05 14:23

Reporter	vboctor	Assigned To	vboctor
Priority	normal	Severity	minor	Reproducibility	have not tried
Status	closed	Resolution	fixed
Product Version	1.2.4
Target Version	1.2.5	Fixed in Version	1.2.5

Summary	0012669: Ordering of version fields in filter area is not ideal
Description	As of 1.2.4, the fields are ordered as follows: Product Version Fixed in Version Priority Target Version The priority and target version need to be swapped.
Tags	patch
Attached Files	12669_master_branch.patch (5,194 bytes) From 044f91075edff9ada1412e63529f6ffd191ef1e8 Mon Sep 17 00:00:00 2001 From: Victor Boctor <vboctor@gmail.com> Date: Sat, 8 Jan 2011 15:35:53 -0800 Subject: [PATCH] Fix #12669: Ordering of version fields in filter area is not ideal. --- core/filter_api.php \| 91 ++++++++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 48 deletions(-) diff --git a/core/filter_api.php b/core/filter_api.php index 45f61f6..3376455 100644 --- a/core/filter_api.php +++ b/core/filter_api.php @@ -2490,6 +2490,9 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e <td colspan="1" class="small-caption"> <a href="<?php echo $t_filters_url . FILTER_PROPERTY_FIXED_IN_VERSION . '[]';?>" id="show_fixed_in_version_filter"<?php echo $t_dynamic_filter_expander_class ?>><?php echo lang_get( 'fixed_in_version_label' )?></a> </td> + <td colspan="1" class="small-caption"> + <a href="<?php echo $t_filters_url . FILTER_PROPERTY_TARGET_VERSION . '[]';?>" id="show_target_version_filter"><?php echo lang_get( 'target_version' )?>:</a> + </td> <?php } else {?> <td colspan="2" class="small-caption"> @@ -2498,6 +2501,9 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e <td colspan="1" class="small-caption">   </td> + <td colspan="1" class="small-caption"> +   + </td> <?php }?> <td colspan="1" class="small-caption"> @@ -2508,12 +2514,6 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e <a href="<?php echo $t_filters_url . FILTER_PROPERTY_TARGET_VERSION . '[]';?>" id="show_target_version_filter"<?php echo $t_dynamic_filter_expander_class ?>><?php echo lang_get( 'target_version_label' )?></a> </td> <?php - } else {?> - <td colspan="1" class="small-caption"> -   - </td> - <?php - } if( $t_filter_cols > 8 ) { echo '<td class="small-caption" colspan="' . ( $t_filter_cols - 7 ) . '"> </td>'; }?> @@ -2697,6 +2697,40 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e } ?> </td> + <td colspan="1" class="small-caption" id="show_target_version_filter_target"> + <?php + $t_output = ''; + $t_any_found = false; + if( count( $t_filter[FILTER_PROPERTY_TARGET_VERSION] ) == 0 ) { + echo lang_get( 'any' ); + } else { + $t_first_flag = true; + foreach( $t_filter[FILTER_PROPERTY_TARGET_VERSION] as $t_current ) { + $t_current = stripslashes( $t_current ); + echo '<input type="hidden" name="', FILTER_PROPERTY_TARGET_VERSION, '[]" value="', string_display( $t_current ), '" />'; + $t_this_string = ''; + if( filter_field_is_any( $t_current ) ) { + $t_any_found = true; + } else if( filter_field_is_none( $t_current ) ) { + $t_this_string = lang_get( 'none' ); + } else { + $t_this_string = string_display( $t_current ); + } + if( $t_first_flag != true ) { + $t_output = $t_output . '<br />'; + } else { + $t_first_flag = false; + } + $t_output = $t_output . $t_this_string; + } + if( true == $t_any_found ) { + echo lang_get( 'any' ); + } else { + echo $t_output; + } + } + ?> + </td> <?php } else {?> <td colspan="2" class="small-caption"> @@ -2705,6 +2739,9 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e <td colspan="1" class="small-caption">   </td> + <td colspan="1" class="small-caption"> +   + </td> <?php }?> <td colspan="1" class="small-caption" id="show_priority_filter_target"> @@ -2736,48 +2773,6 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e echo $t_output; } } - ?> - </td> - <?php if( $t_show_product_version ) { ?> - <td colspan="1" class="small-caption" id="show_target_version_filter_target"> - <?php - $t_output = ''; - $t_any_found = false; - if( count( $t_filter[FILTER_PROPERTY_TARGET_VERSION] ) == 0 ) { - echo lang_get( 'any' ); - } else { - $t_first_flag = true; - foreach( $t_filter[FILTER_PROPERTY_TARGET_VERSION] as $t_current ) { - $t_current = stripslashes( $t_current ); - echo '<input type="hidden" name="', FILTER_PROPERTY_TARGET_VERSION, '[]" value="', string_display( $t_current ), '" />'; - $t_this_string = ''; - if( filter_field_is_any( $t_current ) ) { - $t_any_found = true; - } else if( filter_field_is_none( $t_current ) ) { - $t_this_string = lang_get( 'none' ); - } else { - $t_this_string = string_display( $t_current ); - } - if( $t_first_flag != true ) { - $t_output = $t_output . '<br />'; - } else { - $t_first_flag = false; - } - $t_output = $t_output . $t_this_string; - } - if( true == $t_any_found ) { - echo lang_get( 'any' ); - } else { - echo $t_output; - } - } - ?> - </td> - <?php } else { ?> - <td colspan="1" class="small-caption"> -   - </td> - <?php } if( $t_filter_cols > 8 ) { echo '<td class="small-caption" colspan="' . ( $t_filter_cols - 7 ) . '"> </td>'; -- 1.7.3.3 12669_master_branch.patch (5,194 bytes)