Index: view_all_set.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/view_all_set.php,v
retrieving revision 1.38
diff -u -r1.38 view_all_set.php
--- view_all_set.php	28 Oct 2004 00:31:05 -0000	1.38
+++ view_all_set.php	13 Jan 2005 15:34:11 -0000
@@ -146,6 +146,9 @@
 			}
 		}
 	}
+	
+	$f_relationship_type = gpc_get_string( 'relationship_type', 'any' );
+	$f_relationship_bug = gpc_get_string( 'relationship_bug', 0 );
 
 	if ( $f_temp_filter ) {
 		$f_type = 1;
@@ -202,6 +205,9 @@
 	22: $f_show_version
 	23: $f_do_filter_by_date
 	24: $f_custom_field
+	25: $f_relationship_type
+	26: $f_relationship_bug
+	
 */
 	# Set new filter values.  These are stored in a cookie
 	$t_view_all_cookie_id = gpc_get_cookie( config_get( 'view_all_cookie' ), '' );
@@ -270,6 +276,8 @@
 				$t_setting_arr['user_monitor'] = $f_user_monitor;
 				$t_setting_arr['view_state'] = $f_view_state;
 				$t_setting_arr['custom_fields'] = $f_custom_fields_data;
+				$t_setting_arr['relationship_type'] = $f_relationship_type;
+				$t_setting_arr['relationship_bug'] = $f_relationship_bug;
 
 				break;
 		# Set the sort order and direction
@@ -302,6 +310,9 @@
 				$t_setting_arr['show_priority']	= array( "any" );
 				$t_setting_arr['fixed_in_version']	= array( "any" );
 				$t_setting_arr['user_monitor'] 		= array( "any" );
+				$t_setting_arr['relationship_type'] = "any";
+				$t_setting_arr['relationship_bug'] = 0;
+				
 
 				$t_custom_fields 		= custom_field_get_ids();
 				$t_custom_fields_data 	= array();
Index: view_filters_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/view_filters_page.php,v
retrieving revision 1.22
diff -u -r1.22 view_filters_page.php
--- view_filters_page.php	28 Oct 2004 00:31:06 -0000	1.22
+++ view_filters_page.php	13 Jan 2005 15:03:15 -0000
@@ -11,6 +11,7 @@
 	
 	require_once( $t_core_path.'compress_api.php' );
 	require_once( $t_core_path.'filter_api.php' );
+	require_once( $t_core_path.'relationship_api.php' );
 	require_once( $t_core_path.'current_user_api.php' );
 	require_once( $t_core_path.'bug_api.php' );
 	require_once( $t_core_path.'string_api.php' );
@@ -329,13 +330,14 @@
 	<td class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'show' ) ?></td>
 	<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( 'changed' ) ?></td>
-	<td class="small-caption" colspan="<?php echo ( 4 * $t_custom_cols ); ?>">
+	<td class="small-caption" colspan="<?php echo ( 2 * $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' ) ) { 
 				print "onclick=\"SwitchDateFields();\""; } ?> />
 		<?php echo lang_get( 'use_date_filters' ) ?>
 	</td>
+	<td class="small-caption" colspan="<?php echo ( 2 * $t_custom_cols ); ?>"><?php echo lang_get( 'bug_relationships' ) ?></td>
 </tr>
 <tr class="row-2">
 	<!-- Number of bugs per page -->
@@ -363,7 +365,7 @@
 	<td valign="top" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
 		<input type="text" name="highlight_changed" size="3" maxlength="7" value="<?php echo $t_filter['highlight_changed'] ?>" />
 	</td>
-	<td valign="top" class="left" colspan="<?php echo ( 4 * $t_custom_cols ); ?>">
+	<td valign="top" class="left" colspan="<?php echo ( 2 * $t_custom_cols ); ?>">
 	<table cellspacing="0" cellpadding="0">
 	<!-- Start date -->
 	<tr>
@@ -423,6 +425,17 @@
 	</tr>
 	</table>
 	</td>
+	<!-- Relationship -->
+	<td valign="top" colspan="<?php echo ( 2 * $t_custom_cols ); ?>">
+        <?php 
+            $c_reltype_value = $t_filter['relationship_type'];
+            if (!$c_reltype_value) {
+                $c_reltype_value = "any";
+            }
+            relationship_list_box ($c_reltype_value, "relationship_type", true) ?>
+        <input type="text" name="relationship_bug" size="5" maxlength="10" value="<?php echo $t_filter['relationship_bug'] ?>" />        
+	</td>
+	
 </tr>
 
 <?php
Index: core/filter_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/filter_api.php,v
retrieving revision 1.64
diff -u -r1.64 filter_api.php
--- core/filter_api.php	19 Nov 2004 13:06:29 -0000	1.64
+++ core/filter_api.php	25 Jan 2005 21:07:49 -0000
@@ -15,6 +15,7 @@
 	require_once( $t_core_dir . 'user_api.php' );
 	require_once( $t_core_dir . 'bug_api.php' );
 	require_once( $t_core_dir . 'collapse_api.php' );
+	require_once( $t_core_dir . 'relationship_api.php' );
 
 	###########################################################################
 	# Filter API
@@ -45,14 +46,15 @@
 	# $p_user_id
 	#   - user id to use as current user when filtering.
 	function filter_get_bug_rows( &$p_page_number, &$p_per_page, &$p_page_count, &$p_bug_count, $custom_filter = null, $p_project_id = null, $p_user_id = null ) {
-		$t_bug_table			= config_get( 'mantis_bug_table' );
-		$t_bug_text_table		= config_get( 'mantis_bug_text_table' );
-		$t_bugnote_table		= config_get( 'mantis_bugnote_table' );
-		$t_custom_field_string_table	= config_get( 'mantis_custom_field_string_table' );
-		$t_bugnote_text_table	= config_get( 'mantis_bugnote_text_table' );
-		$t_project_table		= config_get( 'mantis_project_table' );
-		$t_bug_monitor_table	= config_get( 'mantis_bug_monitor_table' );
-		$t_limit_reporters		= config_get( 'limit_reporters' );
+	    $t_bug_table			    = config_get( 'mantis_bug_table' );
+		$t_bug_text_table		    = config_get( 'mantis_bug_text_table' );
+		$t_bugnote_table		    = config_get( 'mantis_bugnote_table' );
+		$t_custom_field_string_table= config_get( 'mantis_custom_field_string_table' );
+		$t_bugnote_text_table	    = config_get( 'mantis_bugnote_text_table' );
+		$t_project_table		    = config_get( 'mantis_project_table' );
+		$t_bug_monitor_table	    = config_get( 'mantis_bug_monitor_table' );
+		$t_bug_relationship_table	= config_get( 'mantis_bug_relationship_table' );
+		$t_limit_reporters		    = config_get( 'limit_reporters' );
 		$t_report_bug_threshold		= config_get( 'report_bug_threshold' );
 
 		$t_current_user_id = auth_get_current_user_id();
@@ -447,6 +449,25 @@
 			array_push( $t_where_clauses, '('. implode( ' OR ', $t_clauses ) .')' );
 		}
 
+		# bug relationship
+		$t_any_found = false;
+		$c_rel_type = $t_filter['relationship_type'];
+		$c_rel_bug = $t_filter['relationship_bug'];
+		if ( 'any' == $c_rel_type || '' == $c_rel_bug) {
+			$t_any_found = true;
+		}
+		if ( !$t_any_found ) {
+		    # use the complementary type
+		    $c_rel_type = relationship_get_complementary_type($c_rel_type);
+			$t_clauses = array();
+			$t_table_name = 'relationship';
+			array_push( $t_from_clauses, $t_bug_relationship_table );
+			array_push( $t_join_clauses, "LEFT JOIN $t_bug_relationship_table as $t_table_name ON $t_table_name.destination_bug_id = $t_bug_table.id" );
+			
+ 			array_push( $t_clauses, "($t_table_name.relationship_type='$c_rel_type' AND $t_table_name.source_bug_id='$c_rel_bug')" );
+			array_push( $t_where_clauses, '('. implode( ' OR ', $t_clauses ) .')' );
+		}
+
 		# custom field filters
 		if( ON == config_get( 'filter_by_custom_fields' ) ) {
 			# custom field filtering
@@ -1263,9 +1284,13 @@
 			<td class="small-caption" valign="top">
 				<a href="<?php PRINT $t_filters_url . 'highlight_changed'; ?>"><?php PRINT lang_get( 'changed' ) ?>:</a>
 			</td>
-			<td class="small-caption" valign="top" colspan="4">
+			<td class="small-caption" valign="top" colspan="2">
 				<a href="<?php PRINT $t_filters_url . 'do_filter_by_date'; ?>"><?php PRINT lang_get( 'use_date_filters' ) ?>:</a>
 			</td>
+			<td class="small-caption" valign="top" colspan="2">
+				<a href="<?php PRINT $t_filters_url . 'relationship_type'; ?>"><?php PRINT lang_get( 'bug_relationships' ) ?>:</a>
+			</td>
+
 			<?php 
 				if ( $t_custom_cols > $t_filter_cols ) {
 					echo '<td colspan="' . ($t_custom_cols - $t_filter_cols) . '">&nbsp;</td>';
@@ -1290,7 +1315,7 @@
 			<td class="small-caption" valign="top">
 				<?php PRINT $t_filter['highlight_changed']; ?>
 			</td>
-			<td class="small-caption" valign="top" colspan="4">
+			<td class="small-caption" valign="top" colspan="2">
 							<?php
 							if ( 'on' == $t_filter['do_filter_by_date'] ) {
 								$t_chars = preg_split( '//', config_get( 'short_date_format' ), -1, PREG_SPLIT_NO_EMPTY );
@@ -1332,6 +1357,25 @@
 							}
 							?>
 			</td>
+
+			<td class="small-caption" valign="top" colspan="2">
+							<?php
+								$t_output = '';
+								$t_any_found = false;
+								$c_rel_type = $t_filter['relationship_type'];
+								$c_rel_bug = $t_filter['relationship_bug'];
+								if ( '' == $c_rel_type || 0 == $c_rel_bug ) {
+									PRINT lang_get( 'any' );
+								} else {
+								    PRINT relationship_get_description_for_history ($c_rel_type) . ' ' . $c_rel_bug;
+								}
+
+							?>
+			</td>
+
+
+
+
 			<?php 
 				if ( $t_custom_cols > $t_filter_cols ) {
 					echo '<td colspan="' . ($t_custom_cols - $t_filter_cols) . '">&nbsp;</td>';
@@ -1849,7 +1893,7 @@
 									  'show_version' => 'string',
 									  'hide_status' => 'int',
 									  'fixed_in_version' => 'string',
-									  'user_monitor' => 'int' );
+									  'user_monitor' => 'int');
 		foreach( $t_multi_select_list as $t_multi_field_name => $t_multi_field_type ) {
 			if ( !isset( $p_filter_arr[$t_multi_field_name] ) ) {
 				if ( 'hide_status' == $t_multi_field_name ) {
@@ -1894,7 +1938,6 @@
 			}
 		}
 		# all of our filter values are now guaranteed to be there, and correct.
-
 		return $p_filter_arr;
 	}
 ?>
Index: core/relationship_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/relationship_api.php,v
retrieving revision 1.27
diff -u -r1.27 relationship_api.php
--- core/relationship_api.php	30 Nov 2004 12:17:04 -0000	1.27
+++ core/relationship_api.php	13 Jan 2005 14:16:02 -0000
@@ -678,9 +678,18 @@
 
  	# --------------------
  	# print HTML relationship listbox
-	function relationship_list_box( $p_default_rel_type = -1 ) {
+	function relationship_list_box( $p_default_rel_type = -1, $p_select_name = "rel_type", $p_include_any = false) {
+?>
+<select name="<?php echo $p_select_name?>">
+<?php if ($p_include_any) { ?>
+<option value="any" <?php echo ( $p_default_rel_type == "any" ? ' selected' : '' ) ?>><?php echo lang_get( 'any' ) ?></option>
+<option value="any"></option>
+<?php 
+    } 
+    if ($p_default_rel_type == "any") {
+        $p_default_rel_type = -100;
+    }
 ?>
-<select name="rel_type">
 <option value="<?php echo BUG_RELATED ?>"<?php echo ( $p_default_rel_type == BUG_RELATED ? ' selected' : '' ) ?>><?php echo lang_get( 'related_to' ) ?></option>
 <option value="<?php echo BUG_DEPENDANT ?>"<?php echo ( $p_default_rel_type == BUG_DEPENDANT ? ' selected' : '' ) ?>><?php echo lang_get( 'dependant_on' ) ?></option>
 <option value="<?php echo BUG_BLOCKS ?>" <?php echo ( $p_default_rel_type == BUG_BLOCKS ? ' selected' : '' ) ?>><?php echo lang_get( 'blocks' ) ?></option>