From 816eb1e9bd788b2b3468481281793639c824996d Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Mon, 25 Feb 2008 22:06:24 +0000
Subject: Bug 415652: Implement Bugzilla->active_custom_fields - Patch by
 Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/bug/create/create.html.tmpl  |  5 ++---
 template/en/default/bug/edit.html.tmpl           | 15 ++++++---------
 template/en/default/bug/show-multiple.html.tmpl  |  2 +-
 template/en/default/list/edit-multiple.html.tmpl |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 8bc4ab465..c8fd0fc10 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -421,10 +421,9 @@ function handleWantsAttachment(wants_attachment) {
 
 <tbody>
   [% USE Bugzilla %]
-  [% custom_fields = Bugzilla.get_fields({ obsolete => 0, custom => 1,
-                                           enter_bug => 1 }) %]
 
-  [% FOREACH field = custom_fields %]
+  [% FOREACH field = Bugzilla.active_custom_fields %]
+    [% NEXT UNLESS field.enter_bug %]
     [% SET value = ${field.name} IF ${field.name}.defined %]
     <tr>
       [% PROCESS bug/field.html.tmpl editable=1 value_span=3 %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 63913beee..1cdf5e798 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -907,15 +907,12 @@
 [%# *** Custom Fields *** %]
 
   [% USE Bugzilla %]
-  [% fields = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %]
-  [% IF fields %]
-    [% FOREACH field = fields %]
-      <tr>
-        [% PROCESS bug/field.html.tmpl value=bug.${field.name}
-                                       editable = bug.check_can_change_field(field.name, 0, 1)
-                                       value_span = 2 %]
-      </tr>
-    [% END %]
+  [% FOREACH field = Bugzilla.active_custom_fields %]
+    <tr>
+      [% PROCESS bug/field.html.tmpl value=bug.${field.name}
+                                     editable = bug.check_can_change_field(field.name, 0, 1)
+                                     value_span = 2 %]
+    </tr>
   [% END %]
 [% END %]
 
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 2104c90a4..2562903a6 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -178,7 +178,7 @@
 
     [% USE Bugzilla %]
     [% field_counter = 0 %]
-    [% FOREACH field = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %]
+    [% FOREACH field = Bugzilla.active_custom_fields %]
         [% field_counter = field_counter + 1 %]
         [%# Odd-numbered fields get an opening <tr> %]
         [% '<tr>' IF field_counter % 2 %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 9aa110359..5607371eb 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -240,7 +240,7 @@
   [% END %]
 
   [% USE Bugzilla %]
-  [% FOREACH field = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %]
+  [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
       [% PROCESS bug/field.html.tmpl value = dontchange
                                      editable = 1
-- 
cgit v1.2.3-24-g4f1b