Bug 778731 - Add email flag to NEEDINFO state

r=glob

4 files changed, 126 insertions, 0 deletions

diff --git a/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl
new file mode 100644
index 000000000..8810b5f21
--- /dev/null
+++ b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl
@@ -0,0 +1,86 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% show_needinfo      = 0 %]
+[% needinfo_requested = 0 %]
+[% needinfo_from      = "" %]
+[% needinfo_from_any  = 0 %]
+
+[% FOREACH type = bug.flag_types %]
+  [% IF type.name == 'needinfo' %]
+    [% show_needinfo = 1 %]
+    [% FOREACH flag = type.flags %]
+      [% IF flag.status == '?' %]
+        [% needinfo_requested = 1 %]
+        [% IF flag.requestee.login %]
+          [% needinfo_from = flag.requestee.login %]
+        [% ELSE %]
+          [% needinfo_from_any = 1 %]
+        [% END %]
+      [% END %]
+    [% END %]
+  [% END %]
+[% END %]
+
+[% IF show_needinfo %]
+  [%# Displays NEEDINFO tag in bug header %]
+  [% IF needinfo_requested %]
+    <script>
+      var summary_container = document.getElementById('static_bug_status');
+      summary_container.appendChild(document.createTextNode('[NEEDINFO]'));
+    </script>
+  [% END %]
+
+  <div id="needinfo_container">
+    [% IF needinfo_requested %]
+      [% IF needinfo_from == user.login || needinfo_from_any %]
+        Adding comment will automatically clear needinfo request.
+      [% ELSE %]
+        <input type="checkbox" id="needinfo_override" name="needinfo_override" value="1">
+        <label for="needinfo_override">
+          I am providing the requested information for this [% terms.bug %] (this will clear needinfo request).
+        </label>
+      [% END %]
+    [% END %]
+
+    [% IF user.in_group('canconfirm') && !is_attachment 
+       && !needinfo_requested && bug.status.is_open %]
+      <script>
+        function needinfoRole (select) {
+          YAHOO.util.Dom.get('needinfo').checked = true;
+          if (select.value == 'other') {
+            YAHOO.util.Dom.removeClass('needinfo_from_container', 'bz_default_hidden');
+            YAHOO.util.Dom.get('needinfo_from').focus();
+          }
+          else {
+            YAHOO.util.Dom.addClass('needinfo_from_container', 'bz_default_hidden');
+          }
+        }
+      </script>
+      <input type="checkbox" name="needinfo" value="1" id="needinfo">
+      <label for="needinfo">Need additional information from</label>
+      <select name="needinfo_role" id="needinfo_role" onchange="needinfoRole(this);">
+        <option value="">anyone</option>
+        <option value="reporter">reporter</option>
+        <option value="assigned_to">assignee</option>
+        [% IF Param('useqacontact') && bug.qa_contact.login != "" %]
+          <option value="qa_contact">qa contact</option>
+        [% END %]
+        <option value="other">other</option>
+      </select>
+      <span id="needinfo_from_container" class="bz_default_hidden">
+        [%+ INCLUDE global/userselect.html.tmpl
+                    id       => "needinfo_from"
+                    name     => "needinfo_from"
+                    size     => 30
+                    value    => ""
+        %]
+      </span>
+    [% END %]
+  </div>
+[% END %]
diff --git a/extensions/Needinfo/template/en/default/hook/attachment/create-form_before_submit.html.tmpl b/extensions/Needinfo/template/en/default/hook/attachment/create-form_before_submit.html.tmpl
new file mode 100644
index 000000000..ea9c17bd5
--- /dev/null
+++ b/extensions/Needinfo/template/en/default/hook/attachment/create-form_before_submit.html.tmpl
@@ -0,0 +1,17 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+<tr>
+  <td>&nbsp;</td>
+  <td>
+    [% PROCESS bug/needinfo.html.tmpl
+       bug => bug
+       is_attachment => 1
+    %]
+  </td>
+</tr>
diff --git a/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl b/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl
new file mode 100644
index 000000000..8f03fc752
--- /dev/null
+++ b/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl
@@ -0,0 +1,12 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% PROCESS bug/needinfo.html.tmpl
+   bug => attachment.bug
+   is_attachment => 1
+%]
diff --git a/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl b/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl
new file mode 100644
index 000000000..90f0cc584
--- /dev/null
+++ b/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl
@@ -0,0 +1,11 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% PROCESS bug/needinfo.html.tmpl
+   bug = bug
+%]