Menu
▾
▴
[Mantisbt-cvs] mantisbt config_defaults_inc.php,1.261,1.262 view_all_set.php,1.53,1.54 view_filters_page.php,1.34,1.35
|
From: Jeroen L. <jl...@us...> - 2005-05-13 00:15:12
|
Update of /cvsroot/mantisbt/mantisbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6291 Modified Files: config_defaults_inc.php view_all_set.php view_filters_page.php Log Message: Added Profile filter and changed version filters to work subprojects Index: view_all_set.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/view_all_set.php,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- view_all_set.php 21 Apr 2005 14:41:07 -0000 1.53 +++ view_all_set.php 13 May 2005 00:14:38 -0000 1.54 @@ -98,6 +98,14 @@ $f_fixed_in_version = gpc_get_string( 'fixed_in_version', META_FILTER_ANY ); $f_fixed_in_version = array( $f_fixed_in_version ); } + + $f_show_profile = array(); + if ( is_array( gpc_get( 'show_profile', null ) ) ) { + $f_show_profile = gpc_get_string_array( 'show_profile', META_FILTER_ANY ); + } else { + $f_show_profile = gpc_get_string( 'show_profile', META_FILTER_ANY ); + $f_show_profile = array( $f_show_profile ); + } $f_show_priority = array(); if ( is_array( gpc_get( 'show_priority', null ) ) ) { @@ -274,6 +282,7 @@ 24: $f_custom_field 25: $f_relationship_type 26: $f_relationship_bug + 27: $f_show_profile */ # Set new filter values. These are stored in a cookie @@ -344,6 +353,7 @@ $t_setting_arr['sticky_issues'] = $f_sticky_issues; $t_setting_arr['relationship_type'] = $f_relationship_type; $t_setting_arr['relationship_bug'] = $f_relationship_bug; + $t_setting_arr['show_profile'] = $f_show_profile; break; # Set the sort order and direction Index: view_filters_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/view_filters_page.php,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- view_filters_page.php 26 Apr 2005 01:17:51 -0000 1.34 +++ view_filters_page.php 13 May 2005 00:14:38 -0000 1.35 @@ -137,7 +137,7 @@ $t_show_version = ( ON == config_get( 'show_product_version' ) ) || ( ( AUTO == config_get( 'show_product_version' ) ) - && ( count( version_get_all_rows( $t_project_id ) ) > 0 ) ); + && ( count( version_get_all_rows_with_subs( $t_project_id ) ) > 0 ) ); ?> <br /> <form method="post" name="filters" action="<?php echo $t_action; ?>"> @@ -176,6 +176,7 @@ <td class="small-caption" colspan="<?php echo ( 2 * $t_custom_cols ); ?>"><?php echo lang_get( 'category' ) ?></td> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'severity' ) ?></td> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'resolution' ) ?></td> + <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'profile' ) ?></td> </tr> <tr class="row-1"> <!-- Reporter --> @@ -202,6 +203,10 @@ <td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> <?php print_filter_show_resolution(); ?> </td> + <!-- Profile --> + <td valign="top" colspan= <?php echo ( 1 * $t_custom_cols ); ?>"> + <?php print_filter_show_profile(); ?> + </td> </tr> <tr class="row-category2"> @@ -224,6 +229,7 @@ <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> </td> <?php } ?> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'priority' ) ?></td> + <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> </td> </tr> <tr class="row-1"> <!-- Status --> @@ -261,9 +267,10 @@ } ?> </td> <!-- Priority --> - <td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> - <?php print_filter_show_priority(); ?> - </td> + <td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> + <?php print_filter_show_priority(); ?> + </td> + <td colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> </td> </tr> <tr class="row-category2"> @@ -271,7 +278,7 @@ <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'view_status' ) ?></td> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'sticky' ) ?></td> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'changed' ) ?></td> - <td class="small-caption" colspan="<?php echo ( 2 * $t_custom_cols ); ?>"> + <td class="small-caption" colspan="<?php echo ( 3 * $t_custom_cols ); ?>"> <input type="checkbox" name="do_filter_by_date" <?php check_checked( $t_filter['do_filter_by_date'], 'on' ); if ( ON == config_get( 'use_javascript' ) ) { @@ -299,7 +306,7 @@ <td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> <?php print_filter_highlight_changed(); ?> </td> - <td valign="top" class="left" colspan="<?php echo ( 2 * $t_custom_cols ); ?>"> + <td valign="top" class="left" colspan="<?php echo ( 3 * $t_custom_cols ); ?>"> <?php print_filter_do_filter_by_date( true ); # hide checkbox as it's already been shown ?> </td> <td valign="top" colspan="<?php echo ( 2 * $t_custom_cols ); ?>"> @@ -362,12 +369,12 @@ print_filter_show_sort(); ?> </td> - <td valign="top" colspan="<?php echo ( 2 * $t_custom_cols ); ?>"> + <td valign="top" colspan="<?php echo ( 3 * $t_custom_cols ); ?>"> </td> </tr> <tr class="row-category2"> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'search' ) ?></td> -<td class="small-caption" colspan="<?php echo ( 6 * $t_custom_cols ); ?>"></td> +<td class="small-caption" colspan="<?php echo ( 7 * $t_custom_cols ); ?>"></td> </tr> <tr> <!-- Search field --> Index: config_defaults_inc.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/config_defaults_inc.php,v retrieving revision 1.261 retrieving revision 1.262 diff -u -d -r1.261 -r1.262 --- config_defaults_inc.php 1 May 2005 14:53:49 -0000 1.261 +++ config_defaults_inc.php 13 May 2005 00:14:37 -0000 1.262 @@ -1141,7 +1141,7 @@ $g_cookie_path = '/'; $g_cookie_domain = ''; # cookie version for view_all_page - $g_cookie_version = 'v6'; + $g_cookie_version = 'v7'; # --- cookie prefix --------------- # set this to a unique identifier. No spaces. |