From 86441b0eccea2c673d51519d0f0d76c6c6022316 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Wed, 1 Apr 2015 22:39:33 +0800
Subject: Bug 1150002: updating a bug clears the requestee of needinfo requests

---
 extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl  | 6 +++++-
 extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 1870d6b5a..024f4f6a5 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -195,7 +195,11 @@
           (NeedInfo from
           [%+
             IF needinfo.size == 1;
-              INCLUDE bug_modal/user.html.tmpl u=needinfo.0.requestee nick_only=1;
+              IF needinfo.0.requestee;
+                INCLUDE bug_modal/user.html.tmpl u=needinfo.0.requestee nick_only=1;
+              ELSE;
+                "anyone";
+              END;
             ELSE;
               " " _ needinfo.size _ " people";
             END;
diff --git a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
index 61e82bf2a..70e7e5c3d 100644
--- a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
@@ -98,7 +98,7 @@
   <tr>
     <td class="flag-setter">
       [% IF f %]
-        [% INCLUDE bug_modal/user.html.tmpl u=flag.setter nick_only=1 %]
+        [% INCLUDE bug_modal/user.html.tmpl u=f.setter nick_only=1 %]
       [% ELSIF t.flags.size %]
         addl.
       [% END %]
@@ -151,7 +151,6 @@
               value    = flag_requestee
               emptyok  = flag_empty_ok
               classes  = [ "requestee" ]
-              disabled = !can_edit
           %]
         </div>
       <td>
-- 
cgit v1.2.3-24-g4f1b