From 1238159c40c02ffe80a727c568baf8d4c313d03f Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 29 May 2013 12:29:30 +0800
Subject: Bug 876414: I should be able to comment on a bug that is
 needinfo?(me) without clearing the needinfo?

---
 extensions/Needinfo/Extension.pm                              |  3 ++-
 .../Needinfo/template/en/default/bug/needinfo.html.tmpl       | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'extensions/Needinfo')

diff --git a/extensions/Needinfo/Extension.pm b/extensions/Needinfo/Extension.pm
index f6cc7d256..622221507 100644
--- a/extensions/Needinfo/Extension.pm
+++ b/extensions/Needinfo/Extension.pm
@@ -153,7 +153,8 @@ sub bug_start_of_update {
         # Clear if comment provided by the proper requestee
         if ($bug->{added_comments}
             && (!$flag->requestee || $flag->requestee->login eq Bugzilla->user->login)
-            && (!$is_private || $flag->setter->is_insider))
+            && (!$is_private || $flag->setter->is_insider)
+            && grep($_ == $flag->id, @needinfo_overrides))
         {
             $clear_needinfo = 1;
         }
diff --git a/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl
index 2ffbbe835..eff05be29 100644
--- a/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl
+++ b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl
@@ -34,10 +34,15 @@
     [% FOREACH flag = needinfo_flags %]
       <tr>
         [% IF !flag.requestee || flag.requestee.id == user.id %]
-          <td align="center"><span style="color:red;font-weight:bold;">*</span></td>
+          <td align="center">
+            <input type="checkbox" id="needinfo_override_[% flag.id FILTER html %]"
+                   name="needinfo_override_[% flag.id FILTER html %]" value="1" checked>
+          </td>
           <td>
-            Adding a comment will automatically clear needinfo the request for
-            <em>[% IF !flag.requestee %]anyone[% ELSE %][% flag.requestee.login FILTER html %][% END %]</em>.
+            <label for="needinfo_override_[% flag.id FILTER html %]">
+              Clear the needinfo request for
+              <em>[% IF !flag.requestee %]anyone[% ELSE %][% flag.requestee.login FILTER html %][% END %]</em>.
+            </label>
           </td>
         [% ELSE %]
           <td align="center">
-- 
cgit v1.2.3-24-g4f1b