2036,2078c2036,2075 < ?> < <
<
< < '; < echo ''; < } < ?> < < < < < 0 ) { < $t_per_row = config_get( 'filter_custom_fields_per_row' ); < $t_num_custom_rows = ceil( count( $t_accessible_custom_fields_ids ) / $t_per_row ); --- >
> > > if( $p_for_screen == false ) { > echo ''; > echo ''; > } > ?> > > >
> $t_filter_cols = config_get( 'filter_custom_fields_per_row' ); > if( $p_expanded ) { > $t_custom_cols = $t_filter_cols; > $t_current_user_access_level = current_user_get_access_level(); > $t_accessible_custom_fields_ids = array(); > $t_accessible_custom_fields_names = array(); > $t_accessible_custom_fields_values = array(); > $t_num_custom_rows = 0; > $t_per_row = 0; > > if( $p_custom_filter === null ) { > if( $t_user_id == $t_current_user_id ) { > $p_custom_filter = current_user_get_bug_filter(); > } else { > $p_custom_filter = user_get_bug_filter( $t_user_id, $t_project_id ); > } > } > > if( ON == config_get( 'filter_by_custom_fields' ) ) { > $t_custom_fields = custom_field_get_linked_ids( $t_project_id ); > foreach( $t_custom_fields as $t_cfid ) { > $t_field_info = custom_field_cache_row( $t_cfid, true ); > if( $t_field_info['access_level_r'] <= $t_current_user_access_level && $t_field_info['filter_by'] ) { > $t_accessible_custom_fields_ids[] = $t_cfid; > $t_accessible_custom_fields_names[] = $t_field_info['name']; > $t_accessible_custom_fields_types[] = $t_field_info['type']; > $t_accessible_custom_fields_values[] = custom_field_distinct_values( $t_field_info ); 2082,2084c2079,2081 < $t_filters_url = 'view_filters_page.php?for_screen=' . $p_for_screen; < if( 'advanced' == $t_view_type ) { < $t_filters_url = $t_filters_url . '&view_type=advanced'; --- > if( count( $t_accessible_custom_fields_ids ) > 0 ) { > $t_per_row = config_get( 'filter_custom_fields_per_row' ); > $t_num_custom_rows = ceil( count( $t_accessible_custom_fields_ids ) / $t_per_row ); 2086c2083 < $t_filters_url = $t_filters_url . '&target_field='; --- > } 2088,2089c2085,2089 < $t_show_build = config_get( 'enable_product_build' ); < $t_show_product_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_filters_url = 'view_filters_page.php?for_screen=' . $p_for_screen; > if( 'advanced' == $t_view_type ) { > $t_filters_url = $t_filters_url . '&view_type=advanced'; > } > $t_filters_url = $t_filters_url . '&target_field='; 2091,2097c2091,2095 < # overload handler_id setting if user isn't supposed to see them (ref #6189) < if( !access_has_project_level( config_get( 'view_handler_threshold' ), $t_project_id ) ) { < $t_filter[FILTER_PROPERTY_HANDLER_ID] = array( < META_FILTER_ANY, < ); < } < ?> --- > # overload handler_id setting if user isn't supposed to see them (ref #6189) > if( !access_has_project_level( config_get( 'view_handler_threshold' ), $t_project_id ) ) { > $t_filter[FILTER_PROPERTY_HANDLER_ID] = array( META_FILTER_ANY,); > } > ?> 2099,2102c2097,2105 < > < --- > > > > > > > > 2105a2109,2111 > > > 2108a2115,2164 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > 2110c2166 < : --- > : 2112,2113c2168,2173 < > > > 8 ) { > echo ''; > }?> > > > > > > > > > > > > > > > > > > > > > > > > > > > > < 8 ) { < echo ''; < }?> < --- > 2128,2131c2230,2247 < < > > > 8 ) { > echo ''; > }?> > > > > > < 8 ) { < echo ''; < }?> < < < > < < < < < < < < < < < < < 8 ) { < echo ''; < }?> < < < < < > > 2571a2667,2669 > > > 2606,2616c2704,2707 < < < < < < 8 ) { < echo ''; < }?> < < < < > < < < < < < < 8 ) { < echo ''; < }?> < < --- > > > 2717c2747,2750 < > > > 2813a2899 > 2814a2901 > 2829,2877c2916 < 8 ) { < echo ''; < }?> < < > < < < < < 8 ) { < echo ''; < }?> < < < < < < < < < --- > 2879c2918,2919 < < > > 8 ) { > echo ''; > }?> > > --- > ?> 3165,3282c3210 < < < < < < < < < 6 ) { < echo ''; < } < } else { < if( $t_filter_cols > 3 ) { < echo ''; < } < } < ?> < --- > 3288,3289c3216,3217 < <
< : <
> : > > : > > : > > : > > : > > : > > : > > : > < : --- > > > > > > : 2115,2116c2175,2226 < < : --- > > > > > : >   > : > > : > > : > > : > > : > > : > > : 2118,2126c2228 < < < : < <  
< > > > : > >  
> $t_output = ''; 2168a2285,2287 > > > 2206a2326,2328 > > > 2246c2368,2371 < --- > > > > 2276a2402,2405 > > > > 2307a2437,2440 > > > > 2341c2474,2477 < --- > > > > 2377,2429c2513,2516 < <  
< : < < < : < < < < : < < < : < < : < <   < <   < < : < < : <  
--- > > > > 2459a2547,2550 > > > > 2497c2588,2591 < --- > > > > 2532,2534c2626,2629 < < <   < <   < --- > > > > 2647,2710c2738,2740 < < '; < $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 . '
'; < } 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; < } < } < ?> <
 
< : < < : < < : < < : < < : < < : <  
--- > > > > 2729a2763,2765 > > > 2736a2773,2776 > > > > 2742a2783,2827 > > > > > $t_output = ''; > $t_any_found = false; > if( count( $t_filter[FILTER_PROPERTY_NOTE_USER_ID] ) == 0 ) { > echo lang_get( 'any' ); > } else { > $t_first_flag = true; > foreach( $t_filter[FILTER_PROPERTY_NOTE_USER_ID] as $t_current ) { > echo ''; > $t_this_name = ''; > if( filter_field_is_none( $t_current ) ) { > $t_this_name = lang_get( 'none' ); > } else if( filter_field_is_any( $t_current ) ) { > $t_any_found = true; > } else if( filter_field_is_myself( $t_current ) ) { > if( access_has_project_level( config_get( 'handle_bug_threshold' ) ) ) { > $t_this_name = '[' . lang_get( 'myself' ) . ']'; > } else { > $t_any_found = true; > } > } else { > $t_this_name = user_get_name( $t_current ); > } > if( $t_first_flag != true ) { > $t_output = $t_output . '
'; > } else { > $t_first_flag = false; > } > $t_output = $t_output . $t_this_name; > } > if( true == $t_any_found ) { > echo lang_get( 'any' ); > } else { > echo $t_output; > } > } > ?> >
 
< < : < < < < : < < < < : < < < < : < <  
< < < < < <   --- > > 2890,2891c2930,2936 <
 
< : < < '; < $t_this_name = ''; < if( filter_field_is_none( $t_current ) ) { < $t_this_name = lang_get( 'none' ); < } else if( filter_field_is_any( $t_current ) ) { < $t_any_found = true; < } else if( filter_field_is_myself( $t_current ) ) { < if( access_has_project_level( config_get( 'handle_bug_threshold' ) ) ) { < $t_this_name = '[' . lang_get( 'myself' ) . ']'; < } else { < $t_any_found = true; < } < } else { < $t_this_name = user_get_name( $t_current ); < } < if( $t_first_flag != true ) { < $t_output = $t_output . '
'; < } else { < $t_first_flag = false; < } < $t_output = $t_output . $t_this_name; < } < if( true == $t_any_found ) { < echo lang_get( 'any' ); < } else { < echo $t_output; < } < } < ?> <
< : < < '; < echo ''; < } < } < ?> < < : < < '; < $t_this_name = ''; < if( META_FILTER_CURRENT == $t_current ) { < $t_this_name = lang_get( 'current' ); < } else { < $t_this_name = project_get_name( $t_current ); < } < if( $t_first_flag != true ) { < $t_output = $t_output . '
'; < } else { < $t_first_flag = false; < } < $t_output = $t_output . $t_this_name; < } < echo $t_output; < } < ?> <
  
--- > > 3307,3321d3234 < $t_view_filters = config_get( 'view_filters' ); < if(( SIMPLE_ONLY != $t_view_filters ) && ( ADVANCED_ONLY != $t_view_filters ) ) { < if( 'advanced' == $t_view_type ) { < print_bracket_link( $f_switch_view_link . 'simple', lang_get( 'simple_filters' ) ); < } else { < print_bracket_link( $f_switch_view_link . 'advanced', lang_get( 'advanced_filters' ) ); < } < } < < if( access_has_project_level( config_get( 'create_permalink_threshold' ) ) ) { < print_bracket_link( 'permalink_page.php?url=' . urlencode( filter_get_url( $t_filter ) ), lang_get( 'create_filter_link' ), < < /* new window = */ < true ); < } 3355a3269,3274 > > > > > > 3363a3283,3284 > > 3375c3296 <