From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 28 Mar 2017 13:08:56 +0000 (-0400)
Subject: Bug 1349769 - takebug should only be default for patch attachments
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9af56b965123c9312df5c1cc49b1e5aac67e70ae;p=thirdparty%2Fbugzilla.git

Bug 1349769 - takebug should only be default for patch attachments
---

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 63bf14b37..eae63adf1 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -84,7 +84,10 @@ TUI_hide_default('attachment_text_field');
         <td>
           <em>If you want to assign this [% terms.bug %] to yourself,
               check the box below.</em><br>
-          <input type="checkbox" id="takebug" name="takebug" value="1" [% IF bug.assigned_to.login == "nobody@mozilla.org" || bug.assigned_to.login.search('.bugs$') %] checked [% END %]>
+          [% IF bug.assigned_to.login == "nobody@mozilla.org" || bug.assigned_to.login.search('.bugs$') %]
+            [% take_if_patch = 1 %]
+          [% END %]
+          <input type="checkbox" id="takebug" name="takebug" value="1" [% IF take_if_patch %] data-take-if-patch="1" [% END %]>
           <label for="takebug">take [% terms.bug %]</label>
           [% bug_statuses = [] %]
           [% FOREACH bug_status = bug.status.can_change_to %]
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl
index 7f738c07f..1ab3893cd 100644
--- a/template/en/default/attachment/createformcontents.html.tmpl
+++ b/template/en/default/attachment/createformcontents.html.tmpl
@@ -28,7 +28,7 @@
     <a id="attachment_data_controller" href="javascript:TUI_toggle_class('attachment_text_field');
                                              javascript:TUI_toggle_class('attachment_data')"
     >paste text as attachment</a>).<br>
-    <input type="file" id="data" name="data" size="50" onchange="DataFieldHandler()">
+    <input type="file" id="data" name="data" size="50" >
   </td>
 </tr>
 <tr class="attachment_text_field">
@@ -55,13 +55,23 @@
   <td>
     <em>If the attachment is a patch, check the box below.</em><br>
     [% Hook.process("patch_notes") %]
-    <input type="checkbox" id="ispatch" name="ispatch" value="1"
-           onchange="setContentTypeDisabledState(this.form);">
+    <input type="checkbox" id="ispatch" name="ispatch" value="1">
     <label for="ispatch">patch</label><br><br>
     [%# Reset this whenever the page loads so that the JS state is up to date %]
-    <script type="text/javascript">
-      YAHOO.util.Event.onDOMReady(function() {
-          bz_fireEvent(document.getElementById('ispatch'), 'change');
+    <script type="text/javascript" [% csp_nonce FILTER none %]>
+      $(function() {
+        $("#file").on("change", function() {
+          DataFieldHandler();
+          // Fire event to keep take-bug in sync.
+          $("#ispatch").change();
+        });
+        $("#ispatch").on("change", function() {
+          setContentTypeDisabledState(this.form);
+          var takebug = $("#takebug");
+          if (takebug.is(":visible") && takebug.data("take-if-patch") && $("#ispatch").prop("checked")) {
+            $("#takebug").prop("checked", true);
+          }
+        }).change();
       });
     </script>