2 files changed, 45 insertions, 0 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index c1f00025e..349b05049 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -497,6 +497,15 @@
     </table>
   [% END %]
 
+[%# *** Custom Fields *** %]
+
+[% USE Bugzilla %]
+<table>
+  [% FOREACH field = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %]
+    [% PROCESS bug/field.html.tmpl value=bug.${field.name} %]
+  [% END %]
+</table>
+
 [%# *** Attachments *** %]
 
   [% PROCESS attachment/list.html.tmpl
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
new file mode 100644
index 000000000..cbde9cf27
--- /dev/null
+++ b/template/en/default/bug/field.html.tmpl
@@ -0,0 +1,36 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
+<tr>
+  [% SWITCH field.type %]
+  [% CASE constants.FIELD_TYPE_FREETEXT %]
+    <th align="right">
+      <label for="[% field.name FILTER html %]">
+        [% field.description FILTER html %]:
+      </label>
+    </th>
+    <td>
+      <input name="[% field.name FILTER html %]"
+             value="[% value FILTER html %]"
+             size="60">
+    </td>
+  [% END %]
+</tr>