From 529394cef99c5cf9e52a74f97dbb36faf1e54698 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Fri, 17 Mar 2006 00:26:47 +0000
Subject: [PATCH] r760: Custom fields now show on newreport.php; fixes
 bug://report/8

---
 docs/changes.txt        |  1 +
 newreport.php           | 16 ++++++++++++++++
 templates/newreport.tpl |  6 +++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 45bb503..a1f822d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,7 @@
 1.0.2
 ==================
 - User help cache was not rebuilt for descriptions in custom fields (http://bugs.iris-studios.com/showreport.php?bugid=7)
+- Custom fields did not appear on newreport.php (http://bugs.iris-studios.com/showreport.php?bugid=8)
 
 1.0.1
 ==================
diff --git a/newreport.php b/newreport.php
index df5f2ee..a4e3704 100755
--- a/newreport.php
+++ b/newreport.php
@@ -182,6 +182,22 @@ if ($_REQUEST['do'] == 'add')
 		}
 	}
 	
+	// custom fields
+	$fields = construct_custom_fields(null, true);		
+	$i = 0;
+	foreach ($fields AS $field)
+	{
+		if ($i % 2 == 0)
+		{
+			$customfields['left'] .= $field;
+		}
+		else
+		{
+			$customfields['right'] .= $field;
+		}
+		$i++;
+	}
+	
 	$pcv_select = construct_pcv_select('cansubmitbugs', $bugsys->in['pcv_select']);
 	
 	$reporter = construct_user_display($bugsys->userinfo);
diff --git a/templates/newreport.tpl b/templates/newreport.tpl
index a45d75f..e91f6fc 100644
--- a/templates/newreport.tpl
+++ b/templates/newreport.tpl
@@ -55,6 +55,8 @@ $header
 		</fieldset>
 		<!-- / severity -->
 		
+		$customfields[left]
+		
 	</div>
 	<!-- / LEFT COLUMN -->
 	
@@ -94,7 +96,9 @@ $header
 		</fieldset>
 		<!-- / priority -->
 		</if>
-								
+		
+		$customfields[right]
+		
 	</div>
 	<!-- / RIGHT COLUMN -->
 </div>
-- 
2.22.5