From a774703f9117173af090283d45f4bf68b82521dd Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Tue, 7 Jun 2005 00:56:05 +0000
Subject: [PATCH] r245: - construct_datastore_select() [includes/functions.php]
 now has the option to include a blank option - search.php display is now done
 mostly by construct_datastore_select()

---
 includes/functions.php | 11 ++++++++++-
 search.php             | 39 +++++----------------------------------
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 271898b..df0cd26 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -309,11 +309,20 @@ function parse_pcv_select($input, $validate = false)
 
 // ################# Start construct_datastore_select ################
 // loops through the specified datastore to create <select>s
-function construct_datastore_select($datastore, $labelname, $valuename, $selectedvalue = 0)
+function construct_datastore_select($datastore, $labelname, $valuename, $selectedvalue = 0, $includeblank = false)
 {
 	global $bugsys;
 	
 	$select = '';
+	
+	if ($includeblank)
+	{
+		$label = '';
+		$value = '';
+		$selected = ((!$selectedvalue) ? true : false);
+		eval('$select .= "' . $bugsys->template->fetch('selectoption') . '";');
+	}
+	
 	foreach ($bugsys->datastore["$datastore"] AS $item)
 	{
 		$label = $item["$labelname"];
diff --git a/search.php b/search.php
index 439b195..c5504fb 100644
--- a/search.php
+++ b/search.php
@@ -220,41 +220,12 @@ if ($_REQUEST['do'] == 'search')
 {
 	$pcv_select = construct_pcv_select('radio', '--');
 	
-	$blankselect = '<option value="0">- Choose -</option>';
+	$select['severity'] = construct_datastore_select('severity', 'severity', 'severityid', $selectedvalue = 0, $includeblank = true);
+	$select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid', $selectedvalue = 0, $includeblank = true);
+	$select['status'] = construct_datastore_select('status', 'status', 'statusid', $selectedvalue = 0, $includeblank = true);
+	$select['resolution'] = construct_datastore_select('resolution', 'resolution', 'resolutionid', $selectedvalue = 0, $includeblank = true);
 	
-	$select['severity'] = $blankselect;
-	foreach ($bugsys->datastore['severity'] AS $severity)
-	{
-		$value = $severity['severityid'];
-		$label = $severity['severity'];
-		eval('$select[severity] .= "' . $template->fetch('selectoption') . '";');
-	}
-	
-	$select['priority'] = $blankselect;
-	foreach ($bugsys->datastore['priority'] AS $priority)
-	{
-		$value = $priority['priorityid'];
-		$label = $priority['priority'];
-		eval('$select[priority] .= "' . $template->fetch('selectoption') . '";');
-	}
-	
-	$select['status'] = $blankselect;
-	foreach ($bugsys->datastore['status'] AS $status)
-	{
-		$value = $status['statusid'];
-		$label = $status['status'];
-		eval('$select[status] .= "' . $template->fetch('selectoption') . '";');
-	}
-	
-	$select['resolution'] = $blankselect;
-	foreach ($bugsys->datastore['resolution'] AS $resolution)
-	{
-		$value = $resolution['resolutionid'];
-		$label = $resolution['resolution'];
-		eval('$select[resolution] .= "' . $template->fetch('selectoption') . '";'); 
-	}
-	
-	$select['dev'] = $blankselect;
+	$select['dev'] = '<option value="0" selected="selected"></option>';
 	foreach ($bugsys->datastore['assignto'] AS $dev)
 	{
 		$value = $dev['userid'];
-- 
2.22.5