From befdcc8f9a30f55e91227bac0ee1813a661002b3 Mon Sep 17 00:00:00 2001
From: David Lawrence <dlawrence@mozilla.com>
Date: Tue, 4 Oct 2011 18:43:47 -0400
Subject: more porting work

---
 .../en/default/bug/create/create-mozpr.html.tmpl   | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl')

diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
index 28a37a31e..a272e0b41 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
@@ -299,9 +299,9 @@ TUI_hide_default('expert_fields');
           </td>
         </tr>
       </table>
-      <input type="hidden" name="bug_severity" value="[% default.bug_severity %]">
-      <input type="hidden" name="rep_platform" value="[% default.rep_platform %]">
-      <input type="hidden" name="op_sys" value="[% default.op_sys %]">
+      <input type="hidden" name="bug_severity" value="[% default.bug_severity FILTER html %]">
+      <input type="hidden" name="rep_platform" value="[% default.rep_platform FILTER html %]">
+      <input type="hidden" name="op_sys" value="[% default.op_sys FILTER html %]">
       <input type="hidden" name="version" value="unspecified">
     </td>
   </tr>
@@ -466,7 +466,7 @@ TUI_hide_default('expert_fields');
     <td colspan="3">
       [% defaultcontent = BLOCK %]
         [% IF cloned_bug_id %]
-+++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id %] +++
++++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id FILTER html %] +++
 
 
         [% END %]
@@ -552,7 +552,7 @@ TUI_hide_default('expert_fields');
       <th>Status Whiteboard:</th>
       <td colspan="3">
         <input id="status_whiteboard" name="status_whiteboard" size="70"
-               value="[% status_whiteboard %]">
+               value="[% status_whiteboard FILTER html %]">
       </td>
     </tr>
     <tr>
@@ -571,13 +571,14 @@ TUI_hide_default('expert_fields');
 </tbody>
 
 <tbody class="expert_fields">
-  [% IF group.size %]
+  [% IF product.groups_available.size %]
   <tr>
     <th>&nbsp;</th>
     <td colspan="3">
       <br>
         <strong>
-          Only users in all of the selected groups can view this [% terms.bug %]:
+          Only users in all of the selected groups can view this 
+          [%+ terms.bug %]:
         </strong>
       <br>
       <font size="-1">
@@ -587,12 +588,14 @@ TUI_hide_default('expert_fields');
       <br>
 
       <!-- Checkboxes -->
-      [% FOREACH g = group %]
-        &nbsp;&nbsp;&nbsp;&nbsp;
-        <input type="checkbox" id="bit-[% g.bit %]"
-          name="bit-[% g.bit %]" value="1"
-          [% " checked=\"checked\"" IF g.checked %]>
-          <label for="bit-[% g.bit %]">[% g.description FILTER html_light %]</label><br>
+      <input type="hidden" name="defined_groups" value="1">
+      [% FOREACH group = product.groups_available %]
+        <input type="checkbox" id="group_[% group.id FILTER html %]"
+               name="groups" value="[% group.name FILTER html %]"
+               [% ' checked="checked"' IF default.groups.contains(group.name)
+                                          OR group.is_default %]>
+        <label for="group_[% group.id FILTER html %]">
+          [%- group.description FILTER html_light %]</label><br>
       [% END %]
     </td>
   </tr>
-- 
cgit v1.2.3-24-g4f1b