summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-04-01 16:39:33 +0200
committerByron Jones <glob@mozilla.com>2015-04-01 16:39:33 +0200
commit86441b0eccea2c673d51519d0f0d76c6c6022316 (patch)
treea04eca04998646dbe89134fcfd343e1461fc1d28
parentae1ea40acf1f8a8d94e612e59ee0b9ebaf303707 (diff)
downloadbugzilla-86441b0eccea2c673d51519d0f0d76c6c6022316.tar.gz
bugzilla-86441b0eccea2c673d51519d0f0d76c6c6022316.tar.xz
Bug 1150002: updating a bug clears the requestee of needinfo requests
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl6
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl3
2 files changed, 6 insertions, 3 deletions
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>