more porting work

1 files changed, 26 insertions, 26 deletions

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index ee19ab5d6..52f4c3cf4 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -59,12 +59,10 @@ var flags = new Array([% product.components.size %]);
     comp_desc[[% count %]] = "[% c.description FILTER html_light FILTER js %]";
     initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]";
     [% flag_list = [] %]
-    [% FOREACH f = c.flag_types.bug %]
-      [% NEXT UNLESS f.is_active %]
+    [% FOREACH f = c.flag_types(is_active=>1).bug %]
       [% flag_list.push(f.id) %]
     [% END %]
-    [% FOREACH f = c.flag_types.attachment %]
-      [% NEXT UNLESS f.is_active %]
+    [% FOREACH f = c.flag_types(is_active=>1).attachment %]
       [% flag_list.push(f.id) %]
     [% END %]
     flags[[% count %]] = [[% flag_list.join(",") FILTER js %]];
@@ -358,18 +356,17 @@ TUI_hide_default('attachment_text_field');
     %]
 
     <td rowspan="[% num_rows FILTER html %]">
-      [% IF product.flag_types.bug.size > 0 %]
+      [% IF product.flag_types(isactive=>1).bug.size > 0 %]
         [% display_flag_headers = 0 %]
         [% any_flags_requesteeble = 0 %]
 
-        [% FOREACH flag_type = product.flag_types.bug %]
-          [% NEXT UNLESS flag_type.is_active %]
+        [% FOREACH flag_type = product.flag_types(is_active=>1).bug %]
           [% display_flag_headers = 1 %]
           [% SET any_flags_requesteeble = 1 IF flag_type.is_requestable && flag_type.is_requesteeble %]
         [% END %]
 
         [% IF display_flag_headers %]
-          [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types.bug
+          [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types(is_active=>1).bug
                                            any_flags_requesteeble = any_flags_requesteeble
                                            flag_table_id = "bug_flags"
           %]
@@ -488,9 +485,11 @@ TUI_hide_default('attachment_text_field');
 
 <tbody>
   [% USE Bugzilla %]
-
+  
   [% FOREACH field = Bugzilla.active_custom_fields %]
     [% NEXT UNLESS field.enter_bug %]
+    [% NEXT IF cf_hidden_in_product(field.name, product.name, component.name) %]
+    
     [% SET value = ${field.name}.defined ? ${field.name} : "" %]
     <tr [% 'class="expert_fields"' IF !field.is_mandatory %]>
       [% INCLUDE bug/field.html.tmpl 
@@ -574,22 +573,6 @@ TUI_hide_default('attachment_text_field');
     </td>
   </tr>
 
-  [% IF user.is_insider %]
-    <tr class="expert_fields">
-      <th>&nbsp;</th>
-      <td colspan="3">
-        &nbsp;&nbsp;
-        <input type="checkbox" id="comment_is_private" name="comment_is_private"
-          [% ' checked="checked"' IF comment_is_private %]
-               onClick="updateCommentTagControl(this, 'comment')">
-        <label for="comment_is_private">
-          Make description and any new attachment private (visible only to members 
-          of the <strong>[% Param('insidergroup') FILTER html %]</strong> group)
-        </label>
-      </td>
-    </tr>
-  [% END %]
-
   [% IF Param("maxattachmentsize") %]
   <tr>
     <th>Attachment:</th>
@@ -605,10 +588,20 @@ TUI_hide_default('attachment_text_field');
           <legend>Add an attachment</legend>
           <table class="attachment_entry">
             [% PROCESS attachment/createformcontents.html.tmpl
-                       flag_types = product.flag_types.attachment
+                       flag_types = product.flag_types(is_active=>1).attachment
                        any_flags_requesteeble = 1
                        flag_table_id ="attachment_flags" %]
           </table>
+
+          [% IF user.is_insider %]
+            <input type="checkbox" id="comment_is_private" name="comment_is_private"
+                   [% ' checked="checked"' IF comment_is_private %]
+                   onClick="updateCommentTagControl(this, 'comment')">
+            <label for="comment_is_private">
+              Make this attachment and [% terms.bug %] description private (visible only 
+              to members of the <strong>[% Param('insidergroup') FILTER html %]</strong> group)
+            </label>
+          [% END %]
         </fieldset>
       </div>
     </td>
@@ -629,6 +622,13 @@ TUI_hide_default('attachment_text_field');
     [% END %]
 
     <tr>
+      <th>Status Whiteboard:</th>
+      <td colspan="3">
+        <input id="status_whiteboard" name="status_whiteboard" size="70"
+               value="[% status_whiteboard FILTER html %]">
+      </td>
+    </tr>
+    <tr>
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.dependson editable = 1
       %]