Modified print_all_bug_page.php to seach bugnotes.

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@944 f5dc347c-c33d-0410-90a0-b07cc1902cb9
mantisbt · May 11, 2002 · 7a96f02 · 7a96f02
1 parent 3a6b1f9
commit 7a96f02
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -56,6 +56,7 @@ Mantis
  * Modified is_duplicate_category().  Reversed the arguments.
  * Modified to use core_project_API.php.
  * Modified to use core_version_API.php.
+ * Modified print_all_bug_page.php to seach bugnotes.
  * Added Hungarian translation.
  * Added Japanese translation.
  * Added Czech translation.

diff --git a/print_all_bug_page.php b/print_all_bug_page.php
@@ -20,8 +20,8 @@
 		print_header_redirect( $g_view_all_set."?f_type=0&f_print=1" );
 	}
 
-	if( !isset( $f_search_text ) ) {
-		$f_search_text = false;
+	if( !isset( $f_search ) ) {
+		$f_search = false;
 	}
 
 	if ( !isset( $f_offset ) ) {
@@ -53,7 +53,7 @@
 
 	# Build our query string based on our viewing criteria
 
-	$query = "SELECT *, UNIX_TIMESTAMP(last_updated) as last_updated
+	$query = "SELECT DISTINCT *, UNIX_TIMESTAMP(last_updated) as last_updated
 			 FROM $g_mantis_bug_table";
 
 	# project selection
@@ -121,22 +121,32 @@
 	}
 
 	# Simple Text Search - Thnaks to Alan Knowles
-	if ($f_search_text) {
-		$t_where_clause .= " AND ((summary LIKE '%".addslashes($f_search_text)."%')
-							OR (description LIKE '%".addslashes($f_search_text)."%')
-							OR (steps_to_reproduce LIKE '%".addslashes($f_search_text)."%')
-							OR (additional_information LIKE '%".addslashes($f_search_text)."%')
-							OR ($g_mantis_bug_table.id LIKE '%".addslashes($f_search_text)."%'))
+	if ($f_search) {
+		$t_columns_clause = " $g_mantis_bug_table.*";
+
+		$t_where_clause .= " AND ((summary LIKE '%".addslashes($f_search)."%')
+							OR (description LIKE '%".addslashes($f_search)."%')
+							OR (steps_to_reproduce LIKE '%".addslashes($f_search)."%')
+							OR (additional_information LIKE '%".addslashes($f_search)."%')
+							OR ($g_mantis_bug_table.id LIKE '%".addslashes($f_search)."%')
+							OR ($g_mantis_bugnote_text_table.note LIKE '%".addslashes($f_search)."%'))
 							AND $g_mantis_bug_text_table.id = $g_mantis_bug_table.bug_text_id";
-		$query = "SELECT $g_mantis_bug_table.*, $g_mantis_bug_text_table.description
-				FROM $g_mantis_bug_table, $g_mantis_bug_text_table ".$t_where_clause;
+
+		$t_from_clause = " FROM $g_mantis_bug_table, $g_mantis_bug_text_table
+							LEFT JOIN $g_mantis_bugnote_table      ON $g_mantis_bugnote_table.bug_id  = $g_mantis_bug_table.id
+							LEFT JOIN $g_mantis_bugnote_text_table ON $g_mantis_bugnote_text_table.id = $g_mantis_bugnote_table.bugnote_text_id ";
 	} else {
-		$query = $query.$t_where_clause;
+		$t_columns_clause = " *";
+		$t_from_clause = " FROM $g_mantis_bug_table";
 	}
 
 	if ( !isset( $f_sort ) ) {
 		$f_sort="last_updated";
 	}
+	$query  = "SELECT DISTINCT ".$t_columns_clause.", UNIX_TIMESTAMP(last_updated) as last_updated";
+	$query .= $t_from_clause;
+	$query .= $t_where_clause;
+
 	$query = $query." ORDER BY '$f_sort' $f_dir";
 	if ( $f_sort != "priority" ) {
 		$query = $query.", priority DESC";
@@ -195,7 +205,7 @@
 </tr>
 <tr>
 	<td>
-	    <input type="text" name="f_search_text" value="<?php echo $f_search_text; ?>">
+	    <input type="text" name="f_search" value="<?php echo $f_search; ?>">
 	</td>
 	<td>
 		<select name="f_user_id">
@@ -265,7 +275,8 @@
 		?>
 	</td>
 	<td class="right">
-		<a href="<?php echo $g_summary_page ?>"><?php echo $s_summary ?></a>
+		<?php print_bracket_link( $g_view_all_bug_page, $s_view_bugs_link ) ?>
+		<?php print_bracket_link( $g_summary_page, $s_summary ) ?>
 	</td>
 <p>
 </tr>

diff --git a/view_all_bug_page.php b/view_all_bug_page.php
@@ -137,13 +137,6 @@
 	# Simple Text Search - Thnaks to Alan Knowles
 	if ( $f_search ) {
 		$t_columns_clause = " $g_mantis_bug_table.*";
-		/*$t_where_clause .= " AND ((summary LIKE '%".addslashes($f_search)."%') OR
-							(description LIKE '%".addslashes($f_search)."%') OR
-							(steps_to_reproduce LIKE '%".addslashes($f_search)."%') OR
-							(additional_information LIKE '%".addslashes($f_search)."%') OR
-							($g_mantis_bugnote_text_table.note LIKE '%".addslashes($f_search)."%')) OR
-							($g_mantis_bug_table.id LIKE '%".addslashes($f_search)."%')) AND
-							$g_mantis_bug_text_table.id = $g_mantis_bug_table.bug_text_id ";*/
 
 		$t_where_clause .= " AND ((summary LIKE '%".addslashes($f_search)."%')
 							OR (description LIKE '%".addslashes($f_search)."%')
@@ -153,11 +146,9 @@
 							OR ($g_mantis_bugnote_text_table.note LIKE '%".addslashes($f_search)."%'))
 							AND $g_mantis_bug_text_table.id = $g_mantis_bug_table.bug_text_id";
 
-
 		$t_from_clause = " FROM $g_mantis_bug_table, $g_mantis_bug_text_table
 							LEFT JOIN $g_mantis_bugnote_table      ON $g_mantis_bugnote_table.bug_id  = $g_mantis_bug_table.id
 							LEFT JOIN $g_mantis_bugnote_text_table ON $g_mantis_bugnote_text_table.id = $g_mantis_bugnote_table.bugnote_text_id ";
-
 	} else {
 		$t_columns_clause = " *";
 		$t_from_clause = " FROM $g_mantis_bug_table";
@@ -207,7 +198,6 @@
 	#     t_offset = 0
 	# for example page number 2, per page 5:
 	#     t_offset = 5
-	#
 	$t_offset = ( ( $f_page_number - 1 ) * $f_per_page );
 	if ( isset( $f_per_page ) ) {
 		$query = $query." LIMIT $t_offset, $f_per_page";