From: <gi...@ma...> - 2008-11-13 19:56:52
|
The branch, master-1.1.x has been updated via 9e6bc9f338836acf0595e0cbf4f462af5df0f022 (commit) from 7289ce7645d29bcb35ae4f88fb68eebadbffabd8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9e6bc9f338836acf0595e0cbf4f462af5df0f022 Author: John Reese <jr...@le...> Date: Thu Nov 13 14:53:42 2008 -0500 Fix #9803: Hide tagging filter if user does not have view access. ----------------------------------------------------------------------- Summary of changes: core/filter_api.php | 4 ++++ view_filters_page.php | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ----------------------------------------------------------------------- commit 9e6bc9f338836acf0595e0cbf4f462af5df0f022 Author: John Reese <jr...@le...> Date: Thu Nov 13 14:53:42 2008 -0500 Fix #9803: Hide tagging filter if user does not have view access. diff --git a/core/filter_api.php b/core/filter_api.php index 893a0a7..d54c02e 100644 --- a/core/filter_api.php +++ b/core/filter_api.php @@ -3635,6 +3635,10 @@ } function print_filter_tag_string() { + if ( !access_has_global_level( config_get( 'tag_view_threshold' ) ) ) { + return; + } + global $t_filter; $t_tag_string = $t_filter['tag_string']; if ( $t_filter['tag_select'] != 0 ) { diff --git a/view_filters_page.php b/view_filters_page.php index 46cec40..2c5658b 100644 --- a/view_filters_page.php +++ b/view_filters_page.php @@ -164,6 +164,8 @@ $t_show_version = ( ON == config_get( 'show_product_version' ) ) || ( ( AUTO == config_get( 'show_product_version' ) ) && ( count( version_get_all_rows_with_subs( $t_project_id ) ) > 0 ) ); + + $t_show_tags = access_has_global_level( config_get( 'tag_view_threshold' ) ); ?> <br /> <form method="post" name="filters" action="<?php echo $t_action; ?>"> @@ -419,7 +421,7 @@ if ( 'simple' == $f_view_type ) { </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 ( ( $t_filter_cols - 2 ) * $t_custom_cols ); ?>"><?php echo lang_get( 'tags' ) ?></td> +<td class="small-caption" colspan="<?php echo ( ( $t_filter_cols - 2 ) * $t_custom_cols ); ?>"><?php if ( $t_show_tags ) { echo lang_get( 'tags' ); } ?></td> <td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"></td> </tr> <tr> @@ -428,7 +430,7 @@ if ( 'simple' == $f_view_type ) { <input type="text" size="16" name="search" value="<?php echo string_html_specialchars( $t_filter['search'] ); ?>" /> </td> - <td class="small-caption" colspan="<?php echo ( ( $t_filter_cols - 2 ) * $t_custom_cols ); ?>"><?php print_filter_tag_string() ?></td> + <td class="small-caption" colspan="<?php echo ( ( $t_filter_cols - 2 ) * $t_custom_cols ); ?>"><?php if ( $t_show_tags ) { print_filter_tag_string(); } ?></td> <!-- Submit button --> <td class="right" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"> ----------------------------------------------------------------------- -- Mantis Bug Tracker |