mantisbt view_filters_page.php,1.29,1.30

Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21320

Modified Files:
        view_filters_page.php 
Log Message:
fixed filter display to obey config show_product_version


Index: view_filters_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/view_filters_page.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- view_filters_page.php       18 Feb 2005 17:58:15 -0000      1.29
+++ view_filters_page.php       19 Feb 2005 18:23:19 -0000      1.30
@@ -68,6 +68,8 @@
                <?php
        }
 
+       # @@@ thraxisp - could this be replaced by a call to 
filter_draw_selection_area2
+       
        $t_filter = current_user_get_bug_filter();
        $t_filter = filter_ensure_valid_filter( $t_filter );
        $t_project_id = helper_get_current_project();
@@ -129,6 +131,9 @@
                $t_select_modifier = 'multiple="multiple" size="10" ';
        }
 
+       $t_show_version = ( ON == config_get( 'show_product_version' ) )
+                       || ( ( AUTO == config_get( 'show_product_version' ) )
+                                               && ( count( 
version_get_all_rows( $t_project_id ) ) > 0 ) );
 ?>
 <br />
 <form method="post" name="filters" action="<?php echo $t_action; ?>">
@@ -207,8 +212,13 @@
        ?>
        </td>
        <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); 
?>"><?php echo lang_get( 'product_build' ) ?></td>
-       <td class="small-caption" colspan="<?php echo ( 2 * $t_custom_cols ); 
?>"><?php echo lang_get( 'product_version' ) ?></td>
-       <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); 
?>"><?php echo lang_get( 'fixed_in_version' ) ?></td>
+       <?php if ( $t_show_version ) { ?>
+               <td class="small-caption" colspan="<?php echo ( 2 * 
$t_custom_cols ); ?>"><?php echo lang_get( 'product_version' ) ?></td>
+               <td class="small-caption" colspan="<?php echo ( 1 * 
$t_custom_cols ); ?>"><?php echo lang_get( 'fixed_in_version' ) ?></td>
+       <?php } else { ?>
+               <td class="small-caption" colspan="<?php echo ( 2 * 
$t_custom_cols ); ?>">&nbsp;</td>
+               <td class="small-caption" colspan="<?php echo ( 1 * 
$t_custom_cols ); ?>">&nbsp;</td>
+       <?php } ?>
        <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); 
?>"><?php echo lang_get( 'priority' ) ?></td>
 </tr>
 <tr class="row-1">
@@ -232,11 +242,19 @@
        </td>
        <!-- Version -->
        <td valign="top" colspan="<?php echo ( 2 * $t_custom_cols ); ?>">
-               <?php print_filter_show_version(); ?>
+               <?php if ( $t_show_version ) {
+                       print_filter_show_version();
+               } else { 
+                       echo "&nbsp;";
+               } ?>
        </td>
        <!-- Fixed in Version -->
        <td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
-               <?php print_filter_show_fixed_in_version(); ?>
+               <?php if ( $t_show_version ) {
+                       print_filter_show_fixed_in_version();
+               } else { 
+                       echo "&nbsp;";
+               } ?>
        </td>
        <!-- Priority -->
   <td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click