From 8076cbac92c228d086e84ebedef01dfff106cd62 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 14 Feb 2013 00:23:29 +0800
Subject: Bug 690833: Add the ability to restrict who can add comments to a bug
 report

---
 .../hook/bug/edit-after_custom_fields.html.tmpl    | 112 ++++++++++++---------
 1 file changed, 63 insertions(+), 49 deletions(-)

(limited to 'extensions/BMO/template/en')

diff --git a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
index de97706b0..f72267246 100644
--- a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
@@ -41,29 +41,36 @@
       <label>Project Flags:</label>
     </td>
     <td>
-      <table id="project-flags">
-      [% FOREACH field = project_flags %]
-        [% NEXT IF NOT user.id AND field.value == "---" %]
-        <tr id="row_[% field.name FILTER js %]">
-          <td>&nbsp;</td>
-          <td>
-            <label for="[% field.name FILTER html %]">
-              [% field_descs.${field.name} FILTER html %]:
-            </label>
-          </td>
-          <td>
-            [% PROCESS bug/field.html.tmpl value = bug.${field.name}
-                                           editable = user.id
-                                           no_tds = 1 %]
-            [% IF user.id %]
-              <span id="ro_[% field.name FILTER html %]" class="bz_hidden">
-                [% bug.${field.name} FILTER html %]
-              </span>
-            [% END %]
-          </td>
-        </tr>
+      [% IF bug.check_can_change_field('flagtypes.name', 0, 1) %]
+        <table id="project-flags">
+        [% FOREACH field = project_flags %]
+          [% NEXT IF NOT user.id AND field.value == "---" %]
+          <tr id="row_[% field.name FILTER js %]">
+            <td>&nbsp;</td>
+            <td>
+              <label for="[% field.name FILTER html %]">
+                [% field_descs.${field.name} FILTER html %]:
+              </label>
+            </td>
+            <td>
+              [% PROCESS bug/field.html.tmpl value = bug.${field.name}
+                                            editable = user.id
+                                            no_tds = 1 %]
+              [% IF user.id %]
+                <span id="ro_[% field.name FILTER html %]" class="bz_hidden">
+                  [% bug.${field.name} FILTER html %]
+                </span>
+              [% END %]
+            </td>
+          </tr>
+        [% END %]
+        </table>
+      [% ELSE %]
+        [% FOREACH field = project_flags %]
+          [% NEXT IF bug.${field.name} == "---" %]
+          [% field_descs.${field.name} FILTER html %]: [% bug.${field.name} FILTER html %]<br>
+        [% END %]
       [% END %]
-      </table>
     </td>
   </tr>
 [% END %]
@@ -74,34 +81,41 @@
       <label>Tracking Flags:</label>
     </td>
     <td>
-      [% IF user.id %]
-        <span id="edit_tracking_fields_action">
-          (<a onclick="bmo_show_tracking_flags()" href="javascript:void(0)">edit</a>)
-        </span>
+      [% IF bug.check_can_change_field('flagtypes.name', 0, 1) %]
+        [% IF user.id %]
+          <span id="edit_tracking_fields_action">
+            (<a onclick="bmo_show_tracking_flags()" href="javascript:void(0)">edit</a>)
+          </span>
+        [% END %]
+        <table id="custom-flags">
+        [% FOREACH field = tracking_flags %]
+          [% NEXT IF NOT user.id AND field.value == "---" %]
+          <tr id="row_[% field.name FILTER js %]">
+            <td>&nbsp;</td>
+            <td>
+              <label for="[% field.name FILTER html %]">
+                [% field_descs.${field.name} FILTER html %]:
+              </label>
+            </td>
+            <td>
+              [% PROCESS bug/field.html.tmpl value = bug.${field.name}
+                                            editable = user.id
+                                            no_tds = 1 %]
+              [% IF user.id %]
+                <span id="ro_[% field.name FILTER html %]" class="bz_hidden">
+                  [% bug.${field.name} FILTER html %]
+                </span>
+              [% END %]
+            </td>
+          </tr>
+        [% END %]
+        </table>
+      [% ELSE %]
+        [% FOREACH field = tracking_flags %]
+          [% NEXT IF bug.${field.name} == "---" %]
+          [% field_descs.${field.name} FILTER html %]: [% bug.${field.name} FILTER html %]<br>
+        [% END %]
       [% END %]
-      <table id="custom-flags">
-      [% FOREACH field = tracking_flags %]
-        [% NEXT IF NOT user.id AND field.value == "---" %]
-        <tr id="row_[% field.name FILTER js %]">
-          <td>&nbsp;</td>
-          <td>
-            <label for="[% field.name FILTER html %]">
-              [% field_descs.${field.name} FILTER html %]:
-            </label>
-          </td>
-          <td>
-            [% PROCESS bug/field.html.tmpl value = bug.${field.name}
-                                           editable = user.id
-                                           no_tds = 1 %]
-            [% IF user.id %]
-              <span id="ro_[% field.name FILTER html %]" class="bz_hidden">
-                [% bug.${field.name} FILTER html %]
-              </span>
-            [% END %]
-          </td>
-        </tr>
-      [% END %]
-      </table>
     </td>
   </tr>
   <script type="text/javascript">
-- 
cgit v1.2.3-24-g4f1b