0004125: [filters] In the advanced page, "any" should be selected by …

…default for all search criteria git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@2763 f5dc347c-c33d-0410-90a0-b07cc1902cb9
mantisbt · Jul 26, 2004 · bab5c2e · bab5c2e
1 parent 6328053
commit bab5c2e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -11,6 +11,7 @@ Mantis ChangeLog
 - 0004093: [filters] Custom field values are a larger type size in view_all_bug_page (narcissus)
 - 0004108: [filters] "Use Date Filters" in advanced filters (narcissus)
 - 0004121: [filters] Filters saved while "All Projects" is the active project (narcissus)
+- 0004125: [filters] In the advanced page, "any" should be selected by default for all search criteria (narcissus)
 - 0004150: [filters] Custom field names are not localised in filters (vboctor)
 - 0004122: [relationships] Upgrade script seems to swap the duplicate relationship (masc)
 - 0004083: [sponsorships] Users without email address must not be able to sponsor issues (thraxisp)

diff --git a/view_filters_page.php b/view_filters_page.php
@@ -173,7 +173,7 @@ function SwitchDateFields() {
 	<!-- Reporter -->
 	<td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="reporter_id[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['reporter_id'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php
 				if ( access_has_project_level( config_get( 'report_bug_threshold' ) ) ) { 
@@ -188,7 +188,7 @@ function SwitchDateFields() {
 	<!-- Monitored by -->
 	<td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="user_monitor[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['user_monitor'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php
 				if ( access_has_project_level( config_get( 'monitor_bug_threshold' ) ) ) {
@@ -203,7 +203,7 @@ function SwitchDateFields() {
 	<!-- Handler -->
 	<td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="handler_id[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['handler_id'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="none" <?php check_selected( $t_filter['handler_id'], 'none' ); ?>><?php echo lang_get( 'none' ) ?></option>
 			<option value="any"></option>
 			<?php
@@ -226,7 +226,7 @@ function SwitchDateFields() {
 	<!-- Category -->
 	<td valign="top" colspan="<?php echo ( 2 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="show_category[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['show_category'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php # This shows orphaned categories as well as selectable categories ?>
 			<?php print_category_complete_option_list( $t_filter['show_category'] ) ?>
@@ -235,15 +235,15 @@ function SwitchDateFields() {
     <!-- Severity -->
     <td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
         <select <?php PRINT $t_select_modifier;?> name="show_severity[]">
-            <option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['show_severity'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
             <option value="any"></option>
             <?php print_enum_string_option_list( 'severity', $t_filter['show_severity'] ) ?>
         </select>
     </td>
 	<!-- Resolution -->
 	<td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="show_resolution[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['show_resolution'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php print_enum_string_option_list( 'resolution', $t_filter['show_resolution'] ) ?>
 		</select>
@@ -269,7 +269,7 @@ function SwitchDateFields() {
 	<!-- Status -->
 	<td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="show_status[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['show_status'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php print_enum_string_option_list( 'status', $t_filter['show_status'] ) ?>
 		</select>
@@ -293,23 +293,23 @@ function SwitchDateFields() {
 	<!-- Build -->
 	<td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="show_build[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['show_build'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php print_build_option_list( $t_filter['show_build'] ) ?>
 		</select>
 	</td>
 	<!-- Version -->
 	<td valign="top" colspan="<?php echo ( 2 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="show_version[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['show_version'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php print_version_option_list( $t_filter['show_version'], null, VERSION_RELEASED ) ?>
 		</select>
 	</td>
 	<!-- Fixed in Version -->
 	<td valign="top" colspan="<?php echo ( 2 * $t_custom_cols ); ?>">
 		<select <?php PRINT $t_select_modifier;?> name="fixed_in_version[]">
-			<option value="any"><?php echo lang_get( 'any' ) ?></option>
+			<option value="any" <?php check_selected( $t_filter['fixed_in_version'], 'any' ); ?>><?php echo lang_get( 'any' ) ?></option>
 			<option value="any"></option>
 			<?php print_version_option_list( $t_filter['fixed_in_version'], null, VERSION_ALL ) ?>
 		</select>
@@ -447,7 +447,9 @@ function SwitchDateFields() {
 				echo '<td colspan="' . ( 1 * $t_filter_cols ) . '">';
 				if ( isset( $t_accessible_custom_fields_names[$t_base + $j] ) ) {
 					echo '<select ' . $t_select_modifier . ' name="custom_field_' . $t_accessible_custom_fields_ids[$t_base + $j] .'[]">';
-					echo '<option value="any">' . lang_get( 'any' ) .'</option>';
+					echo '<option value="any" ';
+					check_selected( $t_filter['custom_fields'][ $t_accessible_custom_fields_ids[$t_base + $j] ], 'any' );
+					echo '>' . lang_get( 'any' ) .'</option>';
 					echo '<option value=""></option>';
 					foreach( $t_accessible_custom_fields_values[$t_base + $j] as $t_item ) {
 						if ( ( strtolower( $t_item ) != "any" ) && ( trim( $t_item ) != "" ) ) {