From: Jeroen L. <jl...@us...> - 2005-12-17 23:09:07
|
Update of /cvsroot/mantisbt/mantisbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19413 Modified Files: config_defaults_inc.php view_all_set.php view_filters_page.php Log Message: Feature #6507: Allow filtering of issues in multiple (unrelated) projects Index: view_all_set.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/view_all_set.php,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- view_all_set.php 10 Dec 2005 02:51:38 -0000 1.58 +++ view_all_set.php 17 Dec 2005 23:08:52 -0000 1.59 @@ -83,6 +83,14 @@ $f_handler_id = array( $f_handler_id ); } + $f_project_id = array(); + if ( is_array( gpc_get( 'project_id', null ) ) ) { + $f_project_id = gpc_get_int_array( 'project_id', META_FILTER_CURRENT ); + } else { + $f_project_id = gpc_get_int( 'project_id', META_FILTER_CURRENT ); + $f_project_id = array( $f_project_id ); + } + $f_show_resolution = array(); if ( is_array( gpc_get( 'show_resolution', null ) ) ) { $f_show_resolution = gpc_get_string_array( 'show_resolution', META_FILTER_ANY ); @@ -343,6 +351,7 @@ $t_setting_arr['highlight_changed'] = $f_highlight_changed; $t_setting_arr['reporter_id'] = $f_reporter_id; $t_setting_arr['handler_id'] = $f_handler_id; + $t_setting_arr['project_id'] = $f_project_id; $t_setting_arr['sort'] = $f_sort; $t_setting_arr['dir'] = $f_dir; $t_setting_arr['start_month'] = $f_start_month; Index: view_filters_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/view_filters_page.php,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- view_filters_page.php 10 Dec 2005 02:51:38 -0000 1.40 +++ view_filters_page.php 17 Dec 2005 23:08:52 -0000 1.41 @@ -372,17 +372,37 @@ } } } + +if ( 'simple' == $f_view_type ) { + $t_project_cols = 0; +} else { + $t_project_cols = 3; +} ?> <tr class="row-1"> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>" valign="top"> <?php PRINT lang_get( 'sort' ) ?>: </td> - <td valign="top" colspan="<?php echo ( ( $t_filter_cols - 1 ) * $t_custom_cols ); ?>"> + <td valign="top" colspan="<?php echo ( ( $t_filter_cols - 1 - $t_project_cols ) * $t_custom_cols ); ?>"> <?php print_filter_show_sort(); ?> </td> + <?php + if ( 'advanced' == $f_view_type ) { + ?> + <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>" valign="top"> + <?php PRINT lang_get( 'email_project' ) ?>: + </td> + <td valign="top" colspan="<?php echo( 2 * $t_custom_cols ); ?>"> + <?php + print_filter_project_id(); + ?> + </td> + <?php + } + ?> </tr> <tr class="row-category2"> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'search' ) ?></td> Index: config_defaults_inc.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/config_defaults_inc.php,v retrieving revision 1.287 retrieving revision 1.288 diff -u -d -r1.287 -r1.288 --- config_defaults_inc.php 8 Dec 2005 14:21:49 -0000 1.287 +++ config_defaults_inc.php 17 Dec 2005 23:08:51 -0000 1.288 @@ -1171,7 +1171,7 @@ $g_cookie_path = '/'; $g_cookie_domain = ''; # cookie version for view_all_page - $g_cookie_version = 'v7'; + $g_cookie_version = 'v8'; # --- cookie prefix --------------- # set this to a unique identifier. No spaces. |